Properly lock the critical section of portage.unmerge() for bug #101240.

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

diff --git a/pym/portage.py b/pym/portage.py
index ef6f32c9cce99c28af27bb7483f9919b0a182582..38a5755e3ac7de1f443afeb47352860de97a6325 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3244,12 +3244,16 @@ def merge(mycat, mypkg, pkgloc, infloc, myroot, mysettings, myebuild=None,
 def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None, ldpath_mtimes=None):
        mylink = dblink(
                cat, pkg, myroot, mysettings, treetype="vartree", vartree=vartree)
-       if mylink.exists():
-               mylink.unmerge(trimworld=mytrimworld, cleanup=1,
-                       ldpath_mtimes=ldpath_mtimes)
-               mylink.delete()
-               return 0
-       return 1
+       try:
+               mylink.lockdb()
+               if mylink.exists():
+                       mylink.unmerge(trimworld=mytrimworld, cleanup=1,
+                               ldpath_mtimes=ldpath_mtimes)
+                       mylink.delete()
+                       return 0
+               return 1
+       finally:
+               mylink.unlockdb()
 
 def getCPFromCPV(mycpv):
        """Calls pkgsplit on a cpv and returns only the cp."""
@@ -5677,8 +5681,6 @@ class dblink:
                global dircache
                dircache={}
 
-               self.lockdb()
-
                self.settings.load_infodir(self.dbdir)
 
                if not pkgfiles:
@@ -5843,7 +5845,7 @@ class dblink:
                        doebuild(myebuildpath, "cleanrm", self.myroot, self.settings,
                                tree="vartree", mydbapi=self.vartree.dbapi,
                                vartree=self.vartree)
-               self.unlockdb()
+
                env_update(target_root=self.myroot, prev_mtimes=ldpath_mtimes)
 
        def isowner(self,filename,destroot):