[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/

[Zac Medico]

commit:     05b16b9d1c4eacc3442b78152f46f5d07943de97
Author:     David James <davidjames <AT> chromium <DOT> org>
AuthorDate: Sun May  8 07:26:42 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May  8 07:30:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=05b16b9d

Fix typos in unmerge function.

BUG=none
TEST=Try unmerging some packages.

Change-Id: Ib643ec95b8da14b49a6b519e445fe57f8995c52c

---
 pym/portage/dbapi/vartree.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 92c467d..a4a4203 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -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):
 	"""