Re: [gentoo-pms] [PATCH v2] EAPI 6: Specify return status for eapply_user.

[Michał Górny]

Dnia 29 października 2015 09:28:53 CET, Ulrich Mueller <ulm@g.o> napisał(a):
>>>>>> On Wed, 28 Oct 2015, Ulrich Mueller wrote:
>
>> It is late in the EAPI 6 process, but I believe that the patch below
>> is a good change. We should specify a return status for eapply_user.
>
>Patch v2, with logic inverted:
>   0 = sources are unmodified
>   1 = patches applied successfully
>   2 = failure
>
>Rationale: The relevant information is if sources are unmodified or
>(potentially) modified, so these two states should correspond to shell
>true and false, respectively.
>
>Also seems natural to return 0 in the most common case that there are
>no user patches, and in the case that eapply_user() is a no-op.

Nah, that's going to be confusing.

  if ! eapply_user; then
    # patches were applied...?!

I'd go for:

0 - applied
1 - no patches
and die on failure

>
>> Please review.
>
>Ulrich
>
>
>From ae6782cc84e18c8c39c2583731ffed0e258db209 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o>
>Date: Thu, 29 Oct 2015 08:10:42 +0100
>Subject: [PATCH] EAPI 6: Specify return status for eapply_user.
>
>Suggested by dilfridge.
>---
> pkg-mgr-commands.tex | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
>index 51f6ebf..0668686 100644
>--- a/pkg-mgr-commands.tex
>+++ b/pkg-mgr-commands.tex
>@@ -157,10 +157,12 @@ Ebuilds must not run any of these commands once
>the current phase function has r
>\item[eapply\_user] \featurelabel{eapply-user} Takes no arguments.
>Package managers supporting it
>apply user-provided patches to the source tree in the current working
>directory. Exact behaviour
>is implementation defined and beyond the scope of this specification.
>Package managers not
>-    supporting it must implement the command as a no-op. Only
>available in EAPIs listed in
>+    supporting it must implement the command as a no-op. Returns 0 if
>the sources are unmodified,
>+    or 1 if patches applied successfully. On failure, returns 2 when
>called using \t{nonfatal},
>+    otherwise aborts the build process. Only available in EAPIs listed
>in
>table~\ref{tab:patch-commands} as supporting \t{eapply\_user}. In EAPIs
>where it is supported,
>\t{eapply\_user} must be called once in the \t{src\_prepare} phase; for
>any subsequent calls
>-    the command will do nothing.
>+    the command will do nothing, and it will return the same status as
>for the first call.
> \end{description}
>
> \begin{algorithm}

-- 
Best regards,
Michał Górny