For bug #175058, comment #15, expand all possible variables in each argument.

svn path=/main/trunk/; revision=6478

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 5e6e27521ecef4e0410ba0a9fdb7a91bb915aca7..5143d7f6536d3ec34f2de9e2c699289adf4e32c3 100644 (file)
--- 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 \