diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-06 19:38:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-06 19:38:01 +0000 |
| commit | 20f6a27b067153a132aef906b9798e3f257b32d5 (patch) | |
| tree | 8b8532392f32502e8fe9c1c73282017853c59e62 /pym | |
| parent | e24cc4388c347006f565896bf45c53dd7eff0a8e (diff) | |
| download | portage-20f6a27b067153a132aef906b9798e3f257b32d5.tar.gz portage-20f6a27b067153a132aef906b9798e3f257b32d5.tar.bz2 portage-20f6a27b067153a132aef906b9798e3f257b32d5.zip | |
Use shlex for better splitting of FETCHCOMMAND. (trunk r6489:6490)
svn path=/main/branches/2.1.2/; revision=6491
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py index fa9f37535..360abe4c1 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2563,15 +2563,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 \ |