From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 6 May 2007 07:56:22 +0000 (-0000)
Subject: Use varexpand to expand FETCHCOMMAND and RESUMECOMMAND.
X-Git-Tag: v2.2_pre1~1451
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11409be482effecdf57673318a47c045bb1c822b;p=portage.git

Use varexpand to expand FETCHCOMMAND and RESUMECOMMAND.

svn path=/main/trunk/; revision=6487
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 5143d7f65..89c0fee58 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2631,13 +2631,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 \