diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-07-31 21:45:18 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-31 21:45:18 -0700 |
| commit | f5e48098ddd114c2448ff0071f4267b3bc4ee880 (patch) | |
| tree | c13c589f0eec373f5b0a49c9ace8fd359a5122de /pym | |
| parent | Add a warning message to the --package-moves[=n] docs, noting that (diff) | |
| download | portage-multirepo-f5e48098ddd114c2448ff0071f4267b3bc4ee880.tar.gz portage-multirepo-f5e48098ddd114c2448ff0071f4267b3bc4ee880.tar.bz2 portage-multirepo-f5e48098ddd114c2448ff0071f4267b3bc4ee880.zip | |
Always use shlex_split() to split CONFIG_PROTECT{,_MASK}.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/actions.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 4 | ||||
| -rw-r--r-- | pym/portage/_global_updates.py | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 16c329bb..bbab613b 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2304,7 +2304,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): trees[settings["ROOT"]]["vartree"].dbapi.match( portage.const.PORTAGE_PACKAGE_ATOM)) - chk_updated_cfg_files("/", settings.get("CONFIG_PROTECT","").split()) + chk_updated_cfg_files("/", + portage.util.shlex_split(settings.get("CONFIG_PROTECT", ""))) if myaction != "metadata": postsync = os.path.join(settings["PORTAGE_CONFIGROOT"], diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 5f0a7663..16d9897d 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -33,7 +33,7 @@ import portage.exception from portage.data import secpass from portage.dbapi.dep_expand import dep_expand from portage.util import normalize_path as normpath -from portage.util import writemsg, writemsg_level, writemsg_stdout +from portage.util import shlex_split, writemsg_level, writemsg_stdout from portage.sets import SETPREFIX from portage._global_updates import _global_updates @@ -320,7 +320,7 @@ def post_emerge(root_config, myopts, mtimedb, retval): settings.regenerate() settings.lock() - config_protect = settings.get("CONFIG_PROTECT","").split() + config_protect = shlex_split(settings.get("CONFIG_PROTECT", "")) infodirs = settings.get("INFOPATH","").split(":") + \ settings.get("INFODIR","").split(":") diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py index d3f55902..7468417a 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: |