diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-09 18:02:41 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-09 18:02:41 -0700 |
| commit | e23e4a36210056ff2d46831f79fa5aa410e0b377 (patch) | |
| tree | dfb61a8111ef68d6ee9f0207a9ce65d9cd9d2389 | |
| parent | 541d2830bf71d7a3f7bb69d739360ef8112ff7b5 (diff) | |
| download | portage-e23e4a36210056ff2d46831f79fa5aa410e0b377.tar.gz portage-e23e4a36210056ff2d46831f79fa5aa410e0b377.tar.bz2 portage-e23e4a36210056ff2d46831f79fa5aa410e0b377.zip | |
Use EROOT in chk_updated_cfg_files() calls.
| -rw-r--r-- | pym/_emerge/actions.py | 5 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 5252b4985..b76195cb9 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2339,7 +2339,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): trees[settings["ROOT"]]["vartree"].dbapi.match( portage.const.PORTAGE_PACKAGE_ATOM)) - chk_updated_cfg_files("/", + chk_updated_cfg_files(settings["EROOT"], portage.util.shlex_split(settings.get("CONFIG_PROTECT", ""))) if myaction != "metadata": @@ -2809,7 +2809,8 @@ def load_emerge_config(trees=None): QueryCommand._db = trees return settings, trees, mtimedb -def chk_updated_cfg_files(target_root, config_protect): +def chk_updated_cfg_files(eroot, config_protect): + target_root = eroot result = list( portage.util.find_updated_config_files(target_root, config_protect)) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 57c7245bf..a2f6e9b9e 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -361,7 +361,7 @@ def post_emerge(root_config, myopts, mtimedb, retval): if vdb_lock: portage.locks.unlockdir(vdb_lock) - chk_updated_cfg_files(target_root, config_protect) + chk_updated_cfg_files(settings['EROOT'], config_protect) display_news_notification(root_config, myopts) if retval in (None, os.EX_OK) or (not "--pretend" in myopts): |