use EROOT with VDB_PATH

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 4550726546e662c790f29d7e1bf64e400d9a9fca..4ca9283dd39e044a7127dfb647baaf88300b7ba1 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -342,7 +342,7 @@ def post_emerge(root_config, myopts, mtimedb, retval):
                # If vdb state has not changed then there's nothing else to do.
                sys.exit(retval)
 
-       vdb_path = os.path.join(target_root, portage.VDB_PATH)
+       vdb_path = os.path.join(root_config.settings['EROOT'], portage.VDB_PATH)
        portage.util.ensure_dirs(vdb_path)
        vdb_lock = None
        if os.access(vdb_path, os.W_OK) and not "--pretend" in myopts:

diff --git a/pym/_emerge/show_invalid_depstring_notice.py b/pym/_emerge/show_invalid_depstring_notice.py
index 21f710839dba49f8e884650dbefa82bbd048187f..284c4e5f804a58ffcf22d8ffa536ccc5f947637c 100644 (file)
--- a/pym/_emerge/show_invalid_depstring_notice.py
+++ b/pym/_emerge/show_invalid_depstring_notice.py
@@ -11,11 +11,11 @@ def show_invalid_depstring_notice(parent_node, depstring, error_msg):
 
        msg1 = "\n\n!!! Invalid or corrupt dependency specification: " + \
                "\n\n%s\n\n%s\n\n" % (error_msg, parent_node)
-       p_type, p_root, p_key, p_status = parent_node
+       p_type, _, p_key, p_status = parent_node
        msg = []
        if p_status == "nomerge":
                category, pf = portage.catsplit(p_key)
-               pkg_location = os.path.join(p_root, portage.VDB_PATH, category, pf)
+               pkg_location = os.path.join(parent_node.root_config.settings['EROOT'], portage.VDB_PATH, category, pf)
                msg.append("Portage is unable to process the dependencies of the ")
                msg.append("'%s' package. " % p_key)
                msg.append("In order to correct this problem, the package ")