Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10036 - main/branches/2.1.2/bin
Date: Tue, 29 Apr 2008 03:33:33
Message-Id: E1Jqgaw-0004iu-1z@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-04-29 03:33:29 +0000 (Tue, 29 Apr 2008)
3 New Revision: 10036
4
5 Modified:
6 main/branches/2.1.2/bin/emerge
7 Log:
8 Prevent some more visible downgrades from possibly being missed (bug #219369).
9 (trunk r10033:10035)
10
11
12 Modified: main/branches/2.1.2/bin/emerge
13 ===================================================================
14 --- main/branches/2.1.2/bin/emerge 2008-04-29 03:13:32 UTC (rev 10035)
15 +++ main/branches/2.1.2/bin/emerge 2008-04-29 03:33:29 UTC (rev 10036)
16 @@ -2933,7 +2933,10 @@
17 # Make --noreplace take precedence over --newuse.
18 if not installed and noreplace and \
19 cpv in vardb.match(atom):
20 - break
21 + # If the installed version is masked, it may
22 + # be necessary to look at lower versions,
23 + # in case there is a visible downgrade.
24 + continue
25 reinstall_for_flags = None
26 cache_key = (pkg_type, root, cpv, pkg_status)
27 calculated_use = True
28 @@ -3091,7 +3094,10 @@
29 if not reinstall_for_flags and \
30 not must_reinstall and \
31 cpv in vardb.match(atom):
32 - break
33 + # If the installed version is masked, it may
34 + # be necessary to look at lower versions,
35 + # in case there is a visible downgrade.
36 + continue
37 if not built:
38 myeb = cpv
39 matched_packages.append(pkg)
40
41 --
42 gentoo-commits@l.g.o mailing list