summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-30 02:12:50 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-30 02:12:50 +0000
commit7c997294d088818ede4153c728153b92f8c07d90 (patch)
treebe925b998f318fa98a9098a2a77277eee3eb162a
parent8f0fc79829e78ec8666b64232594258ec074ef89 (diff)
downloadportage-7c997294d088818ede4153c728153b92f8c07d90.tar.gz
portage-7c997294d088818ede4153c728153b92f8c07d90.tar.bz2
portage-7c997294d088818ede4153c728153b92f8c07d90.zip
Pass parameters into env_update() so that it doesn't depend on global variables.
svn path=/main/trunk/; revision=3699
-rwxr-xr-xbin/emerge9
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index c784ee5fe..d176bbbcf 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2035,7 +2035,9 @@ class depgraph:
"--fetch-all-uri" not in self.myopts:
if (mergecount>0):
if retval:
- portage.env_update()
+ portage.env_update(
+ target_root=self.settings["ROOT"],
+ prev_mtimes=ldpath_mtimes)
#by doing an exit this way, --fetchonly can continue to try to
#fetch everything even if a particular download fails.
@@ -2115,6 +2117,7 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
candidate_catpkgs=[]
global_unmerge=0
xterm_titles = "notitles" not in settings.features
+ ldpath_mtimes = portage.mtimedb["ldpath"]
realsyslist = getlist(settings, "system")
syslist = []
@@ -2350,7 +2353,9 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
else:
emergelog(xterm_titles, " >>> unmerge success: "+y)
#run ldconfig, etc...
- portage.env_update()
+ portage.env_update(
+ target_root=settings["ROOT"],
+ prev_mtimes=ldpath_mtimes)
if not numselected:
return 0
else: