From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A6BA913888F for ; Tue, 20 Oct 2015 07:20:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3425621C001; Tue, 20 Oct 2015 07:20:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C469321C001 for ; Tue, 20 Oct 2015 07:20:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 732D733FAAE for ; Tue, 20 Oct 2015 07:20:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B05D113A9 for ; Tue, 20 Oct 2015 07:19:56 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1445325542.ad4e5ea3fad2986de6075146e4716aefde8e29de.ulm@gentoo> Subject: [gentoo-commits] proj/pms:eapi-6 commit in: / X-VCS-Repository: proj/pms X-VCS-Files: pkg-mgr-commands.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: ad4e5ea3fad2986de6075146e4716aefde8e29de X-VCS-Branch: eapi-6 Date: Tue, 20 Oct 2015 07:19:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 97dfa833-b09d-4155-bd3e-84ca18a0e7e9 X-Archives-Hash: 562fe0211003abc368bbab278f4bdefa commit: ad4e5ea3fad2986de6075146e4716aefde8e29de Author: Ulrich Müller gentoo org> AuthorDate: Tue Oct 20 07:18:30 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Oct 20 07:19:02 2015 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=ad4e5ea3 EAPI 6: Use \RETURN in eapply algorithm where appropriate. pkg-mgr-commands.tex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index ec02e57..51f6ebf 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -178,7 +178,6 @@ Ebuilds must not run any of these commands once the current phase function has r \IF{the \t{files} array is empty} \STATE abort the build process with an error \ENDIF - \FORALL{\t{x} in the \t{files} array} \IF{\t{\$x} is a directory} \IF{\NOT any files match \t{\$x/*.diff} or \t{\$x/*.patch}} @@ -187,16 +186,17 @@ Ebuilds must not run any of these commands once the current phase function has r \FORALL{files \t{f} matching \t{\$x/*.diff} or \t{\$x/*.patch}, sorted in POSIX locale} \STATE call \t{patch -p1 -f -g0 -{}-no-backup-if-mismatch "\$\{options[@]\}" < "\$f"} \IF{child process returned with non-zero exit status} - \STATE return immediately with that error status + \RETURN immediately with that status \ENDIF \ENDFOR \ELSE \STATE call \t{patch -p1 -f -g0 -{}-no-backup-if-mismatch "\$\{options[@]\}" < "\$x"} \IF{child process returned with non-zero exit status} - \STATE return immediately with that error status + \RETURN immediately with that status \ENDIF \ENDIF \ENDFOR +\RETURN shell true (0) \end{algorithmic} \end{algorithm}