When in background mode, redirect "adjusting permissions" messages for

features directories like CCACHE_DIR and DISTCC_DIR. Thanks to Arfrever
for reporting.

svn path=/main/trunk/; revision=11439

1 files changed, 44 insertions, 8 deletions

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 49baf361a..bbfdd7d10 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -14,6 +14,7 @@ try:
 	import sys
 	import copy
 	import errno
+	import logging
 	import os
 	import re
 	import shutil
@@ -990,6 +991,7 @@ class config(object):
 		"EMERGE_WARNING_DELAY", "FETCHCOMMAND", "FETCHCOMMAND_FTP",
 		"FETCHCOMMAND_HTTP", "FETCHCOMMAND_SFTP",
 		"GENTOO_MIRRORS", "NOCONFMEM", "O",
+		"PORTAGE_BACKGROUND",
 		"PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_CALLER",
 		"PORTAGE_ECLASS_WARNING_ENABLE", "PORTAGE_ELOG_CLASSES",
 		"PORTAGE_ELOG_MAILFROM", "PORTAGE_ELOG_MAILSUBJECT",
@@ -4806,6 +4808,37 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
 		writemsg("File Not Found: '%s'\n" % str(e), noiselevel=-1)
 		return 1
 
+	_prepare_workdir(mysettings)
+	_prepare_features_dirs(mysettings)
+
+def _adjust_perms_msg(settings, msg):
+
+	def write(msg):
+		writemsg(msg, noiselevel=-1)
+
+	background = settings.get("PORTAGE_BACKGROUND") == "1"
+	log_path = settings.get("PORTAGE_LOG_FILE")
+	log_file = None
+
+	if background and log_path is not None:
+		try:
+			log_file = open(log_path, 'a')
+		except IOError:
+			def write(msg):
+				pass
+		else:
+			def write(msg):
+				log_file.write(msg)
+				log_file.flush()
+
+	try:
+		write(msg)
+	finally:
+		if log_file is not None:
+			log_file.close()
+
+def _prepare_features_dirs(mysettings):
+
 	features_dirs = {
 		"ccache":{
 			"basedir_var":"CCACHE_DIR",
@@ -4864,16 +4897,18 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
 									not dirmode == (stat.S_IMODE(subdir_st.st_mode) & dirmode))):
 									droppriv_fix = True
 									break
+
 					if droppriv_fix:
-						writemsg(colorize("WARN", " * ") + \
-							 "Adjusting permissions " + \
-							 "for FEATURES=userpriv: '%s'\n" % mydir,
-							noiselevel=-1)
+						_adjust_perms_msg(mysettings,
+							colorize("WARN", " * ") + \
+							"Adjusting permissions " + \
+							"for FEATURES=userpriv: '%s'\n" % mydir)
 					elif modified:
-						writemsg(colorize("WARN", " * ") + \
-							 "Adjusting permissions " + \
-							 "for FEATURES=%s: '%s'\n" % (myfeature, mydir),
-							noiselevel=-1)
+						_adjust_perms_msg(mysettings,
+							colorize("WARN", " * ") + \
+							"Adjusting permissions " + \
+							"for FEATURES=%s: '%s'\n" % (myfeature, mydir))
+
 					if modified or kwargs["always_recurse"] or droppriv_fix:
 						def onerror(e):
 							raise	# The feature is disabled if a single error
@@ -4893,6 +4928,7 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
 					noiselevel=-1)
 				time.sleep(5)
 
+def _prepare_workdir(mysettings):
 	workdir_mode = 0700
 	try:
 		mode = mysettings["PORTAGE_WORKDIR_MODE"]