summaryrefslogtreecommitdiffstats
path: root/bin/portageq
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-06 21:47:56 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-06 21:47:56 +0000
commit78e6f6b713ce7941980143c1e2b63aa845659a21 (patch)
treebe8eee3334df6e917cd4e5fddfce5ab06b204db2 /bin/portageq
parent416c082add3ff875a4f4fc3c063b175ccca7ec7a (diff)
downloadportage-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 'bin/portageq')
-rwxr-xr-xbin/portageq12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/portageq b/bin/portageq
index 825152911..084c20cbb 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -251,12 +251,12 @@ def is_protected(argv):
err.flush()
return 2
- import shlex
from portage.util import ConfigProtect
settings = portage.settings
- protect = shlex.split(settings.get("CONFIG_PROTECT", ""))
- protect_mask = shlex.split(settings.get("CONFIG_PROTECT_MASK", ""))
+ protect = portage.util.shlex_split(settings.get("CONFIG_PROTECT", ""))
+ protect_mask = portage.util.shlex_split(
+ settings.get("CONFIG_PROTECT_MASK", ""))
protect_obj = ConfigProtect(root, protect, protect_mask)
if protect_obj.isprotected(f):
@@ -284,12 +284,12 @@ def filter_protected(argv):
except OSError:
pass
- import shlex
from portage.util import ConfigProtect
settings = portage.settings
- protect = shlex.split(settings.get("CONFIG_PROTECT", ""))
- protect_mask = shlex.split(settings.get("CONFIG_PROTECT_MASK", ""))
+ protect = portage.util.shlex_split(settings.get("CONFIG_PROTECT", ""))
+ protect_mask = portage.util.shlex_split(
+ settings.get("CONFIG_PROTECT_MASK", ""))
protect_obj = ConfigProtect(root, protect, protect_mask)
protected = 0