From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 11 Nov 2009 21:11:51 +0000 (-0000)
Subject: previous commit was too optimistic, pass on the required variables onto the new functions
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=42f266b1b6578365131637a9cc66a3e4fa65918c;p=portage.git

previous commit was too optimistic, pass on the required variables onto the new functions

svn path=/main/branches/prefix/; revision=14813
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 3816c8a80..2949b3a7b 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1037,10 +1037,15 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
 		env.update(myconfig)
 	
 	if EPREFIX == '':
-		dolinkingstuff()
-	writeshellprofile()
+		sleep_for_mtime_granularity = dolinkingstuff(
+				target_root, specials, prelink_capable,
+				makelinks, contents)
+	else:
+		sleep_for_mtime_granularity = False
+	writeshellprofile(target_root, env, sleep_for_mtime_granularity)
 
-def dolinkingstuff():
+def dolinkingstuff(target_root, specials, prelink_capable, makelinks,
+		contents):
 	# updating this stuff will never work in an offset, other than ROOT
 	# (e.g. not in Prefix), hence the EPREFIX is not taken into account
 	# here since this code should never be triggered on an offset install
@@ -1184,7 +1189,9 @@ def dolinkingstuff():
 
 	del specials["LDPATH"]
 
-def writeshellprofile():
+	return sleep_for_mtime_granularity
+
+def writeshellprofile(target_root, env, sleep_for_mtime_granularity):
 	penvnotice  = "# THIS FILE IS AUTOMATICALLY GENERATED BY env-update.\n"
 	penvnotice += "# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES\n"
 	cenvnotice  = penvnotice[:]