Use EROOT in chk_updated_cfg_files() calls.
authorZac Medico <zmedico@gentoo.org>
Fri, 10 Sep 2010 01:02:41 +0000 (18:02 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 10 Sep 2010 01:02:41 +0000 (18:02 -0700)
pym/_emerge/actions.py
pym/_emerge/main.py

index 5252b4985bc18cc230887f2fd3010779b822537f..b76195cb9a45c3fe3a9bf4fcf4e3986c6613f33c 100644 (file)
@@ -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))
 
index 57c7245bf3b428dc897082cf9270a303c8b4623c..a2f6e9b9ecc4a785eb78eea3c00d22ded53f2ef6 100644 (file)
@@ -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):