use EROOT with VDB_PATH

diff --git a/bin/archive-conf b/bin/archive-conf
index 97c055df1e7f9de0ce6fa5a3d20aaa0cf7b8f201..5a03b856a22416d05f395166c64d0e8b05fef444 100755 (executable)
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -63,7 +63,8 @@ def archive_conf():
         md5_match_hash[conf] = ''
 
     # Find all the CONTENT files in VDB_PATH.
-    content_files += os.popen(FIND_EXTANT_CONTENTS % (os.path.join(portage.root, portage.VDB_PATH))).readlines()
+    content_files += os.popen(FIND_EXTANT_CONTENTS %
+                       (os.path.join(portage.settings['EROOT'], portage.VDB_PATH))).readlines()
 
     # Search for the saved md5 checksum of all the specified config files
     # and see if the current file is unmodified or not.

diff --git a/bin/emaint b/bin/emaint
index 5ff60422c7e5ad188237dd70383cce26f90792f7..aa2e9a5c8f7021d6d7f4a8c5d8c66516a85cadde 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -389,7 +389,7 @@ class VdbKeyHandler(object):
                self.keys = ["HOMEPAGE", "SRC_URI", "KEYWORDS", "DESCRIPTION"]
                
                for p in self.list:
-                       mydir = os.path.join(os.sep, portage.settings["ROOT"], portage.const.VDB_PATH, p)+os.sep
+                       mydir = os.path.join(os.sep, portage.settings["EROOT"], portage.const.VDB_PATH, p)+os.sep
                        ismissing = True
                        for k in self.keys:
                                if os.path.exists(mydir+k):
@@ -406,7 +406,7 @@ class VdbKeyHandler(object):
                errors = []
        
                for p in self.missing:
-                       mydir = os.path.join(os.sep, portage.settings["ROOT"], portage.const.VDB_PATH, p)+os.sep
+                       mydir = os.path.join(os.sep, portage.settings["EROOT"], portage.const.VDB_PATH, p)+os.sep
                        if not os.access(mydir+"environment.bz2", os.R_OK):
                                errors.append("Can't access %s" % (mydir+"environment.bz2"))
                        elif not os.access(mydir, os.W_OK):

diff --git a/bin/portageq b/bin/portageq
index 940575b1fee90f7e21b5e157657fb6e8d64cd9df..27a2e250eebe59ca51dfd722582842876f2609d9 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -456,7 +456,7 @@ def vdb_path(argv):
        set environment/configuration options.
        """
        out = sys.stdout
-       out.write(os.path.join(portage.settings["ROOT"], portage.VDB_PATH) + "\n")
+       out.write(os.path.join(portage.settings["EROOT"], portage.VDB_PATH) + "\n")
        out.flush()
        return os.EX_OK
 

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index ca84d850b7ea857223f2675587fcb62ee550fa7b..5a962c57d6be18c28a50327f84cc86ada491dd7e 100644 (file)
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -102,7 +102,7 @@ class FakeVartree(vartree):
                after one or more packages may have been installed or
                uninstalled.
                """
-               vdb_path = os.path.join(self.root, portage.VDB_PATH)
+               vdb_path = os.path.join(self.settings['EROOT'], portage.VDB_PATH)
                try:
                        # At least the parent needs to exist for the lock file.
                        portage.util.ensure_dirs(vdb_path)

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index dc9030ea2cd77c27a302089daf2da4b0cf5a9354..bbed031713401bcb647faa1dafa26d7dc8c7945e 100644 (file)
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -47,7 +47,7 @@ def unmerge(root_config, myopts, unmerge_action,
                        pkg_cache[cpv] = pkg
                return pkg
 
-       vdb_path = os.path.join(settings["ROOT"], portage.VDB_PATH)
+       vdb_path = os.path.join(settings["EROOT"], portage.VDB_PATH)
        try:
                # At least the parent needs to exist for the lock file.
                portage.util.ensure_dirs(vdb_path)
@@ -118,7 +118,7 @@ def unmerge(root_config, myopts, unmerge_action,
        
                                        sp_absx_len = len(sp_absx)
        
-                                       vdb_path = os.path.join(settings["ROOT"], portage.VDB_PATH)
+                                       vdb_path = os.path.join(settings["EROOT"], portage.VDB_PATH)
                                        vdb_len  = len(vdb_path)
        
                                        sp_vdb     = vdb_path.split("/")