diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-29 04:53:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-29 04:53:15 +0000 |
| commit | 62922180cd7add6eda865aa331e471cef978b740 (patch) | |
| tree | b70ea91fa17d61c06365343f71614b0091e0e134 | |
| parent | e4ca983efd7a0b971f1fd702aac3af1f0ff0c0bf (diff) | |
| download | portage-62922180cd7add6eda865aa331e471cef978b740.tar.gz portage-62922180cd7add6eda865aa331e471cef978b740.tar.bz2 portage-62922180cd7add6eda865aa331e471cef978b740.zip | |
Make the unmerge time CONFIG_MEMORY_FILE pruning slightly more aggressive,
so that anything not claimed by another package in the same slot is
pruned.
svn path=/main/trunk/; revision=10474
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 428e3d24e..ed61bcd7c 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1517,9 +1517,6 @@ class dblink(object): continue if obj.startswith(dest_root): relative_path = obj[dest_root_len:] - if not others_in_slot and \ - relative_path in cfgfiledict: - stale_confmem.append(relative_path) is_owned = False for dblnk in others_in_slot: if dblnk.isowner(relative_path, dest_root): @@ -1530,6 +1527,8 @@ class dblink(object): # don't unmerge it. show_unmerge("---", "replaced", file_type, obj) continue + elif relative_path in cfgfiledict: + stale_confmem.append(relative_path) # next line includes a tweak to protect modules from being unmerged, # but we don't protect modules from being overwritten if they are # upgraded. We effectively only want one half of the config protection |