This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
Re: Setup patch to keep test version if test version installed
- From: Achim Gratz <Stromeko at nexgo dot de>
- To: cygwin-apps at cygwin dot com
- Date: Sun, 25 Jan 2015 19:42:46 +0100
- Subject: Re: Setup patch to keep test version if test version installed
- Authentication-results: sourceware.org; auth=none
- References: <20150125172030 dot GJ18550 at calimero dot vinschen dot de>
Corinna Vinschen writes:
> Instead of always defaulting to the curr version, Setup now checks if
> the installed version of a package is higher than the curr version of
> the package. If so, and if a test version exists for this package, it
> will choose the test version by default. A welcome side effect of this
> is, if the test version becomes the curr version, the installed version
> will not be higher than curr, thus the curr version will be chosen
> again.
I'd say that's good enough for now.
> Index: package_meta.h
> ===================================================================
> RCS file: /cvs/cygwin-apps/setup/package_meta.h,v
> retrieving revision 2.42
> diff -u -p -r2.42 package_meta.h
> --- package_meta.h 25 Jul 2013 12:03:49 -0000 2.42
> +++ package_meta.h 25 Jan 2015 17:16:30 -0000
> @@ -94,6 +94,8 @@ public:
> {
> if (t == TRUST_TEST && exp)
> return exp;
> + else if (curr < installed && exp)
> + return exp;
> else if (curr)
> return curr;
> else
I'd prefer to re-arrange the tests to something along the lines of
--8<---------------cut here---------------start------------->8---
if (exp)
{
if ( (t == TRUST_TEST) ||
(curr < installed) )
--8<---------------cut here---------------end--------------->8---
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptation for Waldorf rackAttack V1.04R1:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada