From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 3 Mar 2010 01:27:27 +0000 (-0000)
Subject: Remove preserve libs code from unmerge() that accidentally got merged from
X-Git-Tag: v2.1.8~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ad384451156d5c77eabda8f221760255d3931390;p=portage.git

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 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):