diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-05 17:40:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-05 17:40:51 +0000 |
| commit | b4c9251aab5100e919bd014487eaddbd8d2bd66f (patch) | |
| tree | 33337ba70ece19d6038553bce23ab3198ea60e56 /pym | |
| parent | 9b782090d17370bbdfe8def40f062c0fe485abe2 (diff) | |
| download | portage-b4c9251aab5100e919bd014487eaddbd8d2bd66f.tar.gz portage-b4c9251aab5100e919bd014487eaddbd8d2bd66f.tar.bz2 portage-b4c9251aab5100e919bd014487eaddbd8d2bd66f.zip | |
For bug #175058, comment #15, expand all possible variables in each argument.
svn path=/main/trunk/; revision=6478
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 5e6e27521..5143d7f65 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2635,9 +2635,9 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", "${URI}":loc, "${FILE}":myfile} for i in xrange(len(myfetch)): token = myfetch[i].strip("\"'") - value = variables.get(token) - if value is not None: - myfetch[i] = value + for var, value in variables.iteritems(): + token = token.replace(var, value) + myfetch[i] = token spawn_keywords = {} if "userfetch" in mysettings.features and \ |