[gentoo-commits] proj/portage:2.1.9 commit in: pym/_emerge/

["Zac Medico" <zmedico@gentoo.org>]

commit:     1c8ec672ea685d346e355b7e44416b2258bc66bd
Author:     David James <davidjames <AT> chromium <DOT> org>
AuthorDate: Sun May  8 06:08:01 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May  8 18:54:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1c8ec672

Use new vardbapi lock function in FakeVartree.

BUG=none
TEST=Merged some packages with new code. Ran test suite.

Change-Id: Ibb9380122631bf6c79e39691233cfd641931b75a

---
 pym/_emerge/FakeVartree.py |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index 919770b..db31535 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -116,20 +116,15 @@ class FakeVartree(vartree):
 		after one or more packages may have been installed or
 		uninstalled.
 		"""
-		vdb_path = os.path.join(self.settings['EROOT'], portage.VDB_PATH)
+		locked = False
 		try:
-			# At least the parent needs to exist for the lock file.
-			portage.util.ensure_dirs(vdb_path)
-		except portage.exception.PortageException:
-			pass
-		vdb_lock = None
-		try:
-			if acquire_lock and os.access(vdb_path, os.W_OK):
-				vdb_lock = portage.locks.lockdir(vdb_path)
+			if acquire_lock and os.access(self._real_vardb._dbroot, os.W_OK):
+				self._real_vardb.lock()
+				locked = True
 			self._sync()
 		finally:
-			if vdb_lock:
-				portage.locks.unlockdir(vdb_lock)
+			if locked:
+				self._real_vardb.unlock()
 
 		# Populate the old-style virtuals using the cached values.
 		# Skip the aux_get wrapper here, to avoid unwanted