diff options
Diffstat (limited to 'pym')
-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 \ |