summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-04 23:43:38 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-04 23:43:38 +0000
commit4ca862e20fd6d912ae400943893071c62b7f62e7 (patch)
treefc3ee2b56d77ab8624428d0aeb39045d9b4b7ffe
parent575589606fdfa997a71ba1bbdf4663d5fa005f46 (diff)
downloadportage-4ca862e20fd6d912ae400943893071c62b7f62e7.tar.gz
portage-4ca862e20fd6d912ae400943893071c62b7f62e7.tar.bz2
portage-4ca862e20fd6d912ae400943893071c62b7f62e7.zip
Fix broken reference to self inside unmerge().
svn path=/main/trunk/; revision=11809
-rw-r--r--pym/portage/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 002bb4d6e..8dc4dc9c2 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -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):