This is the mail archive of the cygwin-apps mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] setup: update non-experimental packages too when Exp is selected


On Thu, Aug 19, 2010 at 06:30:07AM +0100, Andy Koppe wrote:
>At the moment, non-experimental packages don't get updated when 'Exp'
>is selected. This was reported at
>http://cygwin.com/ml/cygwin/2010-08/msg00460.html.
>
>The fix turned out to be quite simple.
>
>Andy
>
>
>ChangeLog:
>        * package_meta.h (packagemeta::trustp): Update non-experimental
>        packages too when Exp is selected.
>
>Index: package_meta.h
>===================================================================
>RCS file: /cvs/cygwin-apps/setup/package_meta.h,v
>retrieving revision 2.38
>diff -u -r2.38 package_meta.h
>--- package_meta.h      13 Dec 2009 19:23:43 -0000      2.38
>+++ package_meta.h      19 Aug 2010 05:06:47 -0000
>@@ -94,9 +94,9 @@
>   std::string action_caption () const;
>   packageversion trustp (trusts const t) const
>   {
>-    return t == TRUST_PREV ? (prev ? prev : (curr ? curr : installed))
>-         : t == TRUST_CURR ? (curr ? curr : installed)
>-        : exp ? exp : installed;
>+    return t == TRUST_PREV && prev ? prev
>+         : t == TRUST_TEST && exp ? exp
>+         : curr ? curr : installed;
>   }

Any chance you could add some parentheses here to make the nested ?'s
easier to understand?

Otherwise, I'll take your word for it that this works and say:  Approved.

cgf


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]