From 183c9d8ba7a559a8acd20327b91d68f0a49cdaa6 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 5 May 2007 17:41:18 +0000
Subject: [PATCH] For bug #175058, comment #15, expand all possible variables
 in each argument. (trunk r6477:6478)

svn path=/main/branches/2.1.2/; revision=6479
---
 pym/portage.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pym/portage.py b/pym/portage.py
index ceef30f70..56f5ff529 100644
--- 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 \
-- 
2.26.2