diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-29 03:33:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-29 03:33:29 +0000 |
| commit | bc219a1c095c700c0935c98d9b43bad2a3f3c66b (patch) | |
| tree | c810b28c160d5d9e958b6987cdcbe1dfa95db3fa | |
| parent | a3a836d3a2ad8905e50755bfddcd3e7245f69167 (diff) | |
| download | portage-bc219a1c095c700c0935c98d9b43bad2a3f3c66b.tar.gz portage-bc219a1c095c700c0935c98d9b43bad2a3f3c66b.tar.bz2 portage-bc219a1c095c700c0935c98d9b43bad2a3f3c66b.zip | |
Prevent some more visible downgrades from possibly being missed (bug #219369).
(trunk r10033:10035)
svn path=/main/branches/2.1.2/; revision=10036
| -rwxr-xr-x | bin/emerge | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 34b57fde3..e2c20582c 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2933,7 +2933,10 @@ class depgraph(object): # Make --noreplace take precedence over --newuse. if not installed and noreplace and \ cpv in vardb.match(atom): - break + # If the installed version is masked, it may + # be necessary to look at lower versions, + # in case there is a visible downgrade. + continue reinstall_for_flags = None cache_key = (pkg_type, root, cpv, pkg_status) calculated_use = True @@ -3091,7 +3094,10 @@ class depgraph(object): if not reinstall_for_flags and \ not must_reinstall and \ cpv in vardb.match(atom): - break + # If the installed version is masked, it may + # be necessary to look at lower versions, + # in case there is a visible downgrade. + continue if not built: myeb = cpv matched_packages.append(pkg) |