From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 Jun 2006 03:03:44 +0000 (-0000)
Subject: Trigger env_update() after each unmerge operation.
X-Git-Tag: v2.1.1~340
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3979f40f4e55fb5d6079271d48d5c0de331db32b;p=portage.git

Trigger env_update() after each unmerge operation.

svn path=/main/trunk/; revision=3703
---

diff --git a/bin/emerge b/bin/emerge
index 3e3d556ed..a7fc1182c 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2030,15 +2030,6 @@ class depgraph:
 		if portage.mtimedb.has_key("resume"):
 			del portage.mtimedb["resume"]
 
-		if "--pretend" not in self.myopts:
-			if "--fetchonly" not in self.myopts and \
-				"--fetch-all-uri" not in self.myopts:
-				if (mergecount>0):
-					if retval:
-						portage.env_update(
-							target_root=self.settings["ROOT"],
-							prev_mtimes=ldpath_mtimes)
-
 		#by doing an exit this way, --fetchonly can continue to try to
 		#fetch everything even if a particular download fails.
 		if "--fetchonly" in self.myopts or "--fetch-all-uri" in self.myopts:
@@ -2352,10 +2343,6 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
 				emergelog(xterm_titles, " !!! unmerge FAILURE: "+y)
 			else:
 				emergelog(xterm_titles, " >>> unmerge success: "+y)
-	#run ldconfig, etc...
-	portage.env_update(
-		target_root=settings["ROOT"],
-		prev_mtimes=ldpath_mtimes)
 	return 1
 
 
diff --git a/pym/portage.py b/pym/portage.py
index d1174f212..e290f8c20 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5916,8 +5916,9 @@ class dblink:
 		self.contentscache=pkgfiles
 		return pkgfiles
 
-	def unmerge(self,pkgfiles=None,trimworld=1,cleanup=1):
-		global db, dircache
+	def unmerge(self, pkgfiles=None, trimworld=1, cleanup=1,
+		ldpath_mtimes=None):
+		global dircache
 		dircache={}
 
 		self.lockdb()
@@ -6121,6 +6122,7 @@ class dblink:
 				tree="vartree", mydbapi=self.vartree.dbapi,
 				vartree=self.vartree)
 		self.unlockdb()
+		env_update(self.myroot, prev_mtimes=ldpath_mtimes)
 
 	def isowner(self,filename,destroot):
 		""" check if filename is a new file or belongs to this package