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

svn path=/main/branches/2.1.2/; revision=6479

diff --git a/pym/portage.py b/pym/portage.py
index ceef30f70710d6b01155522b262c7c76069ae6cd..56f5ff529e965a12b7d0e5f8511e0ef2f1ee00e8 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2568,9 +2568,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 \