summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-21 02:50:07 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-21 02:50:07 +0000
commit21383934708fe77241eeb74dba0106b38e55a913 (patch)
treeb2e98fbd9959487a6016e0c997524953affbcb94 /bin/emerge
parent8530a4e267a7bf61e669888bca3f07b576b81270 (diff)
downloadportage-21383934708fe77241eeb74dba0106b38e55a913.tar.gz
portage-21383934708fe77241eeb74dba0106b38e55a913.tar.bz2
portage-21383934708fe77241eeb74dba0106b38e55a913.zip
Log parallel-fetch output to /var/log/emerge-fetch.log just in case it's needed (see bug #137105). This patch is from trunk r3525 and r3526.
svn path=/main/branches/2.1/; revision=3569
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge11
1 files changed, 8 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index 86ded28d9..fce95547a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1936,10 +1936,15 @@ class depgraph:
sys.stdout.close()
sys.stderr.close()
time.sleep(3) # allow the parent to have first fetch
- sys.stdout = open("/dev/null","w")
- sys.stderr = open("/dev/null","w")
+ fetchlog = "/var/log/emerge-fetch.log"
+ sys.stdout = open(fetchlog, "w")
+ sys.stderr = sys.stdout
os.dup2(sys.stdout.fileno(), 1)
- os.dup2(sys.stdout.fileno(), 2)
+ os.dup2(sys.stderr.fileno(), 2)
+ portage_util.apply_secpass_permissions(fetchlog,
+ uid=portage.portage_uid, gid=portage.portage_gid,
+ mode=0660)
+
# wipe the mtimedb so that portage doesn't attempt to flush it.
# do not convert this code away from a fork without correcting this.
portage.mtimedb = None