Trigger env_update() after each unmerge operation.

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

diff --git a/bin/emerge b/bin/emerge
index 3e3d556ed007f005cf4d4778c8ad59790b2f2657..a7fc1182c61c08fb3542b29f42d612f0bcc14f8b 100755 (executable)
--- 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 d1174f212daa3069659914588237e2f341d14304..e290f8c209eec59ae26ab1a8c10b6598d0b836eb 100644 (file)
--- 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