From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 3 Nov 2007 23:43:31 +0000 (-0000)
Subject: Bug #197797 - Do not actively clear o+rx permission bits
X-Git-Tag: v2.2_pre1~451
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79c8f649ff319f22479a3378bdf9566ccc5b0128;p=portage.git

Bug #197797 - Do not actively clear o+rx permission bits
on the /var/lib/portage directory. Only clear the o+w
bits. This allows users who aren't in the portage group
to have read access to the world file by default, but
administrators can explicitly chmod o-rx that directory
if necessary, and portage will leave those bits alone.

This makes the permission settings in dblink.treewalk()
consistent with those that are already defined in
config._init_dirs().

svn path=/main/trunk/; revision=8408
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 291452f22..8adab4696 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2000,10 +2000,7 @@ class dblink(object):
 			del cfgfiledict["IGNORE"]
 
 		my_private_path = os.path.join(destroot, PRIVATE_PATH)
-		if not os.path.exists(my_private_path):
-			os.makedirs(my_private_path)
-			os.chown(my_private_path, os.getuid(), portage_gid)
-			os.chmod(my_private_path, 02770)
+		ensure_dirs(my_private_path, gid=portage_gid, mode=02750, mask=02)
 
 		writedict(cfgfiledict, conf_mem_file)
 		del conf_mem_file