Fix typos in unmerge function.
authorDavid James <davidjames@chromium.org>
Sun, 8 May 2011 07:26:42 +0000 (00:26 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 8 May 2011 07:30:13 +0000 (00:30 -0700)
BUG=none
TEST=Try unmerging some packages.

Change-Id: Ib643ec95b8da14b49a6b519e445fe57f8995c52c

pym/portage/dbapi/vartree.py

index 92c467d432ae5acd4185079d481785abaee5ee7a..a4a42032871f30ac84f2a7e6ab39676014b03936 100644 (file)
@@ -4071,18 +4071,18 @@ def unmerge(cat, pkg, myroot=None, settings=None,
        mylink = dblink(cat, pkg, settings=settings, treetype="vartree",
                vartree=vartree, scheduler=scheduler)
        vartree = mylink.vartree
-       parallel_install = "parallel-install" in self.settings.features
+       parallel_install = "parallel-install" in settings.features
        if not parallel_install:
-               self.lockdb()
+               mylink.lockdb()
        try:
                if mylink.exists():
                        retval = mylink.unmerge(ldpath_mtimes=ldpath_mtimes)
                        if retval == os.EX_OK:
-                               self.lockdb()
+                               mylink.lockdb()
                                try:
                                        mylink.delete()
                                finally:
-                                       self.unlockdb()
+                                       mylink.unlockdb()
                        return retval
                return os.EX_OK
        finally:
@@ -4092,7 +4092,7 @@ def unmerge(cat, pkg, myroot=None, settings=None,
                else:
                        vartree.dbapi._linkmap._clear_cache()
                if not parallel_install:
-                       self.unlockdb()
+                       mylink.unlockdb()
 
 def write_contents(contents, root, f):
        """