diff options
| author | Fabian Groffen <grobian@gentoo.org> | 2010-09-04 19:43:53 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-04 19:43:53 +0200 |
| commit | e3c7244706e2efdae7adfa9816348c3bb74c319f (patch) | |
| tree | c294a048a09a74edd196d14da91c834337c6419b | |
| parent | c7eb78e9cba3d8837e65792652432c8d42a59152 (diff) | |
| download | portage-e3c7244706e2efdae7adfa9816348c3bb74c319f.tar.gz portage-e3c7244706e2efdae7adfa9816348c3bb74c319f.tar.bz2 portage-e3c7244706e2efdae7adfa9816348c3bb74c319f.zip | |
use EROOT with VDB_PATH
| -rwxr-xr-x | bin/archive-conf | 3 | ||||
| -rwxr-xr-x | bin/emaint | 4 | ||||
| -rwxr-xr-x | bin/portageq | 2 | ||||
| -rw-r--r-- | pym/_emerge/FakeVartree.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/unmerge.py | 4 |
5 files changed, 8 insertions, 7 deletions
diff --git a/bin/archive-conf b/bin/archive-conf index 97c055df1..5a03b856a 100755 --- 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 5ff60422c..aa2e9a5c8 100755 --- 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 940575b1f..27a2e250e 100755 --- 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 ca84d850b..5a962c57d 100644 --- 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 dc9030ea2..bbed03171 100644 --- 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("/") |