Explicitly load the preserved libs registry after obtaining a lock for merge

or unmerge, in case the registry has been changed by a parallel emerge
instance.

svn path=/main/trunk/; revision=11779

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4713d8830c7b4d9b64943a01019d70952795102b..d6b2f77dfac8c86b65c8fe1dd033f0c9a4988c60 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6066,6 +6066,7 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None,
        try:
                mylink.lockdb()
                if mylink.exists():
+                       vartree.dbapi.plib_registry.load()
                        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 c203d7707388367d2b8952af26bbaf42d119d89a..68e0ecf16e5afcb02e40b97b2104c60ad37ce51f 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3743,6 +3743,7 @@ class dblink(object):
                retval = -1
                self.lockdb()
                try:
+                       self.vartree.dbapi.plib_registry.load()
                        retval = self.treewalk(mergeroot, myroot, inforoot, myebuild,
                                cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes)
                        # undo registrations of preserved libraries, bug #210501