Remove preserve libs code from unmerge() that accidentally got merged from

trunk.

svn path=/main/branches/2.1.7/; revision=15727

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d1228458af727fa6291e2ebc7688dc14d197be0f..2f09ecaa29156bf07940e10d0e914c611a2103a8 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3335,8 +3335,6 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None,
        try:
                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:
@@ -3344,7 +3342,6 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None,
                        return retval
                return os.EX_OK
        finally:
-               vartree.dbapi.linkmap._clear_cache()
                mylink.unlockdb()
 
 def write_contents(contents, root, f):