From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 6 Jun 2007 05:58:17 +0000 (-0000)
Subject: For bug #82378, only set permissions on PORT_LOGDIR if it is created automatically.
X-Git-Tag: v2.2_pre1~1287
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2924d703e4cbe5fbd53569a7d469a016a04d5c9f;p=portage.git

For bug #82378, only set permissions on PORT_LOGDIR if it is created automatically.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 901e25875..c931ed32a 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3365,8 +3365,10 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
 			del mysettings["PORT_LOGDIR"]
 	if "PORT_LOGDIR" in mysettings:
 		try:
-			portage.util.ensure_dirs(mysettings["PORT_LOGDIR"],
-				uid=portage_uid, gid=portage_gid, mode=02770)
+			modified = portage.util.ensure_dirs(mysettings["PORT_LOGDIR"])
+			if modified:
+				apply_secpass_permissions(mysettings["PORT_LOGDIR"],
+					uid=portage_uid, gid=portage_gid, mode=02770)
 		except portage.exception.PortageException, e:
 			writemsg("!!! %s\n" % str(e), noiselevel=-1)
 			writemsg("!!! Permission issues with PORT_LOGDIR='%s'\n" % \