diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-11-01 07:09:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-01 07:09:19 +0000 |
| commit | aa313aee5cbdde80b466e8907a81f8625ac1ad22 (patch) | |
| tree | 14b8a849de83c2c3301c99b8e9376d95be4eeb8c | |
| parent | Explicitly load the preserved libs registry after obtaining a lock for merge (diff) | |
| download | portage-multirepo-aa313aee5cbdde80b466e8907a81f8625ac1ad22.tar.gz portage-multirepo-aa313aee5cbdde80b466e8907a81f8625ac1ad22.tar.bz2 portage-multirepo-aa313aee5cbdde80b466e8907a81f8625ac1ad22.zip | |
Also call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock
and loading it for merge or unmerge.
svn path=/main/trunk/; revision=11780
| -rw-r--r-- | pym/portage/__init__.py | 1 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index d6b2f77d..92c567f1 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6067,6 +6067,7 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None, mylink.lockdb() if mylink.exists(): vartree.dbapi.plib_registry.load() + vartree.dbapi.plib_registry.pruneNonExisting() retval = mylink.unmerge(trimworld=mytrimworld, cleanup=1, ldpath_mtimes=ldpath_mtimes) if retval == os.EX_OK: diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 68e0ecf1..c2403917 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3744,6 +3744,7 @@ class dblink(object): self.lockdb() try: self.vartree.dbapi.plib_registry.load() + self.vartree.dbapi.plib_registry.pruneNonExisting() retval = self.treewalk(mergeroot, myroot, inforoot, myebuild, cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes) # undo registrations of preserved libraries, bug #210501 |