diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-06 21:47:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-06 21:47:56 +0000 |
| commit | 78e6f6b713ce7941980143c1e2b63aa845659a21 (patch) | |
| tree | be8eee3334df6e917cd4e5fddfce5ab06b204db2 /pym/_emerge/actions.py | |
| parent | 416c082add3ff875a4f4fc3c063b175ccca7ec7a (diff) | |
| download | portage-78e6f6b713ce7941980143c1e2b63aa845659a21.tar.gz portage-78e6f6b713ce7941980143c1e2b63aa845659a21.tar.bz2 portage-78e6f6b713ce7941980143c1e2b63aa845659a21.zip | |
Add a new portage.util.shlex_split() function to wrap all shlex.split() calls,
since shlex.split() doesn't behave well with unicode strings.
svn path=/main/trunk/; revision=13939
Diffstat (limited to 'pym/_emerge/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 94ec37e8a..4632c10f2 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -9,7 +9,6 @@ import os import platform import pwd import re -import shlex import signal import socket import stat @@ -1833,8 +1832,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): # defaults. portage.writemsg("Using PORTAGE_RSYNC_OPTS instead of hardcoded defaults\n", 1) - rsync_opts.extend( - shlex.split(settings.get("PORTAGE_RSYNC_OPTS",""))) + rsync_opts.extend(portage.util.shlex_split( + settings.get("PORTAGE_RSYNC_OPTS", ""))) for opt in ("--recursive", "--times"): if opt not in rsync_opts: portage.writemsg(yellow("WARNING:") + " adding required option " + \ @@ -1912,7 +1911,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): user_name="" updatecache_flg=True all_rsync_opts = set(rsync_opts) - extra_rsync_opts = shlex.split( + extra_rsync_opts = portage.util.shlex_split( settings.get("PORTAGE_RSYNC_EXTRA_OPTS","")) all_rsync_opts.update(extra_rsync_opts) family = socket.AF_INET |