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 | |
| 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')
| -rw-r--r-- | pym/_emerge/BinpkgFetcher.py | 4 | ||||
| -rw-r--r-- | pym/_emerge/actions.py | 7 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index 977ccb4d8..f3b11bb6c 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -5,7 +5,7 @@ from _emerge.SpawnProcess import SpawnProcess import urlparse import sys -import shlex + try: import portage except ImportError: @@ -83,7 +83,7 @@ class BinpkgFetcher(SpawnProcess): fetch_env = dict(settings.iteritems()) fetch_args = [portage.util.varexpand(x, mydict=fcmd_vars) \ - for x in shlex.split(fcmd)] + for x in portage.util.shlex_split(fcmd)] if self.fd_pipes is None: self.fd_pipes = {} 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 diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index e0e66d8ac..78ac776f5 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -3,7 +3,6 @@ # $Id$ import logging -import shlex import signal import sys import textwrap @@ -779,7 +778,7 @@ def ionice(settings): ionice_cmd = settings.get("PORTAGE_IONICE_COMMAND") if ionice_cmd: - ionice_cmd = shlex.split(ionice_cmd) + ionice_cmd = portage.util.shlex_split(ionice_cmd) if not ionice_cmd: return |