aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-07-31 21:45:18 -0700
committerZac Medico <zmedico@gentoo.org>2010-07-31 21:45:18 -0700
commitf5e48098ddd114c2448ff0071f4267b3bc4ee880 (patch)
treec13c589f0eec373f5b0a49c9ace8fd359a5122de /pym/portage
parentAdd a warning message to the --package-moves[=n] docs, noting that (diff)
downloadportage-f5e48098ddd114c2448ff0071f4267b3bc4ee880.tar.gz
portage-f5e48098ddd114c2448ff0071f4267b3bc4ee880.tar.bz2
portage-f5e48098ddd114c2448ff0071f4267b3bc4ee880.zip
Always use shlex_split() to split CONFIG_PROTECT{,_MASK}.
Diffstat (limited to 'pym/portage')
-rw-r--r--pym/portage/_global_updates.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py
index d3f55902d..7468417ac 100644
--- a/pym/portage/_global_updates.py
+++ b/pym/portage/_global_updates.py
@@ -12,7 +12,8 @@ from portage.exception import DirectoryNotFound
from portage.localization import _
from portage.output import bold, colorize
from portage.update import grab_updates, parse_updates, update_config_files, update_dbentry
-from portage.util import grabfile, writemsg, writemsg_stdout, write_atomic
+from portage.util import grabfile, shlex_split, \
+ writemsg, writemsg_stdout, write_atomic
def _global_updates(trees, prev_mtimes):
"""
@@ -143,8 +144,8 @@ def _global_updates(trees, prev_mtimes):
world_list[pos] = new_atom
world_modified = True
update_config_files(root,
- mysettings.get("CONFIG_PROTECT","").split(),
- mysettings.get("CONFIG_PROTECT_MASK","").split(),
+ shlex_split(mysettings.get("CONFIG_PROTECT", "")),
+ shlex_split(mysettings.get("CONFIG_PROTECT_MASK", "")),
myupd, match_callback=_world_repo_match)
for update_cmd in myupd: