Fix broken reference to self inside unmerge().
authorZac Medico <zmedico@gentoo.org>
Tue, 4 Nov 2008 23:43:38 +0000 (23:43 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 4 Nov 2008 23:43:38 +0000 (23:43 -0000)
svn path=/main/trunk/; revision=11809

pym/portage/__init__.py

index 002bb4d6ec31c33c5d5527fd57dd1266a7183961..8dc4dc9c2baa084a7b93df81aebef7754b7b88c5 100644 (file)
@@ -6079,6 +6079,7 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None,
        ldpath_mtimes=None, scheduler=None):
        mylink = dblink(cat, pkg, myroot, mysettings, treetype="vartree",
                vartree=vartree, scheduler=scheduler)
+       vartree = mylink.vartree
        try:
                mylink.lockdb()
                if mylink.exists():
@@ -6091,7 +6092,7 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None,
                        return retval
                return os.EX_OK
        finally:
-               self.vartree.dbapi.linkmap._clear_cache()
+               vartree.dbapi.linkmap._clear_cache()
                mylink.unlockdb()
 
 def getCPFromCPV(mycpv):