From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 6 May 2007 19:37:37 +0000 (-0000)
Subject: Use shlex for better splitting of FETCHCOMMAND.
X-Git-Tag: v2.2_pre1~1450
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=831012141601a654e1450ea2f9a5f5d9d6610d1a;p=portage.git

Use shlex for better splitting of FETCHCOMMAND.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 89c0fee58..4cdfebe6f 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2630,15 +2630,15 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 						locfetch=fetchcommand
 					writemsg_stdout(">>> Downloading '%s'\n" % \
 						re.sub(r'//(.+):.+@(.+)/',r'//\1:*password*@\2/', loc))
-					myfetch = locfetch.split()
 					variables = {
 						"DISTDIR": mysettings["DISTDIR"],
 						"URI":     loc,
 						"FILE":    myfile
 					}
-					
-					for i in xrange(len(myfetch)):
-						myfetch[i] = varexpand(myfetch[i], mydict=variables)
+					import shlex, StringIO
+					lexer = shlex.shlex(StringIO.StringIO(locfetch), posix=True)
+					lexer.whitespace_split = True
+					myfetch = [varexpand(x, mydict=variables) for x in lexer]
 
 					spawn_keywords = {}
 					if "userfetch" in mysettings.features and \