From ad384451156d5c77eabda8f221760255d3931390 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 3 Mar 2010 01:27:27 +0000 Subject: [PATCH] Remove preserve libs code from unmerge() that accidentally got merged from trunk. svn path=/main/branches/2.1.7/; revision=15727 --- pym/portage/dbapi/vartree.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index d1228458a..2f09ecaa2 100644 --- 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): -- 2.26.2