From 9c529238b8ec6cc410d4d20c568eab86527298ac Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 15 Nov 2006 09:00:22 +0000
Subject: Don't try to lock the vdb unless privileges are sufficient.

svn path=/main/trunk/; revision=5053
---
 bin/emerge | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/emerge b/bin/emerge
index d51c9c609..41ad34e76 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2705,10 +2705,11 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
 	global_unmerge=0
 	xterm_titles = "notitles" not in settings.features
 
+	vdb_path = os.path.join(settings["ROOT"], portage.VDB_PATH)
 	vdb_lock = None
 	try:
-		vdb_lock = portage_locks.lockdir(
-			os.path.join(settings["ROOT"], portage.VDB_PATH))
+		if os.access(vdb_path, os.W_OK):
+			vdb_lock = portage_locks.lockdir(vdb_path)
 		realsyslist = getlist(settings, "system")
 		syslist = []
 		for x in realsyslist:
-- 
cgit v1.2.3-1-g7c22