diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-06 07:57:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-06 07:57:00 +0000 |
| commit | e24cc4388c347006f565896bf45c53dd7eff0a8e (patch) | |
| tree | 20d80874c133c58c26a42180f2a406c8a1fbe2c0 | |
| parent | ac68d2db74da2d1e56ef1889590461b2270a10e5 (diff) | |
| download | portage-e24cc4388c347006f565896bf45c53dd7eff0a8e.tar.gz portage-e24cc4388c347006f565896bf45c53dd7eff0a8e.tar.bz2 portage-e24cc4388c347006f565896bf45c53dd7eff0a8e.zip | |
Use varexpand to expand FETCHCOMMAND and RESUMECOMMAND. (trunk r6486:6487)
svn path=/main/branches/2.1.2/; revision=6488
| -rw-r--r-- | pym/portage.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pym/portage.py b/pym/portage.py index 56f5ff529..fa9f37535 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2564,13 +2564,14 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", writemsg_stdout(">>> Downloading '%s'\n" % \ re.sub(r'//(.+):.+@(.+)/',r'//\1:*password*@\2/', loc)) myfetch = locfetch.split() - variables = {"${DISTDIR}":mysettings["DISTDIR"], - "${URI}":loc, "${FILE}":myfile} + variables = { + "DISTDIR": mysettings["DISTDIR"], + "URI": loc, + "FILE": myfile + } + for i in xrange(len(myfetch)): - token = myfetch[i].strip("\"'") - for var, value in variables.iteritems(): - token = token.replace(var, value) - myfetch[i] = token + myfetch[i] = varexpand(myfetch[i], mydict=variables) spawn_keywords = {} if "userfetch" in mysettings.features and \ |