use EROOT with WORLD_FILE

diff --git a/bin/emaint b/bin/emaint
index aa2e9a5c8f7021d6d7f4a8c5d8c66516a85cadde..f11829897cd39a9dfbbef8f4581002f8a60c69fb 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -40,7 +40,7 @@ class WorldHandler(object):
        def _check_world(self, onProgress):
                categories = set(portage.settings.categories)
                myroot = portage.settings["ROOT"]
-               self.world_file = os.path.join(myroot, portage.const.WORLD_FILE)
+               self.world_file = os.path.join(portage.settings["EROOT"], portage.const.WORLD_FILE)
                self.found = os.access(self.world_file, os.R_OK)
                vardb = portage.db[myroot]["vartree"].dbapi
 

diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py
index ed51411214b975222166214ba2bab042296394d2..b06cab36f8b61f53b349f8dd03ac172f663912a8 100644 (file)
--- a/pym/portage/_global_updates.py
+++ b/pym/portage/_global_updates.py
@@ -49,7 +49,7 @@ def _global_updates(trees, prev_mtimes):
                # only populated with local packages here (getbinpkgs=0).
                bindb.bintree.populate()
 
-       world_file = os.path.join(root, WORLD_FILE)
+       world_file = os.path.join(mysettings['EROOT'], WORLD_FILE)
        world_list = grabfile(world_file)
        world_modified = False
        world_warnings = set()

diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py
index c474f1b5f9d892974ffc589135680bfff7004ab8..21993316b3b6ee828ec0cc77742e6225cfa07e14 100644 (file)
--- a/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -208,16 +208,16 @@ class ConfigFileSet(PackageSet):
 class WorldSelectedSet(EditablePackageSet):
        description = "Set of packages that were directly installed by the user"
        
-       def __init__(self, root):
+       def __init__(self, eroot):
                super(WorldSelectedSet, self).__init__()
                # most attributes exist twice as atoms and non-atoms are stored in 
                # separate files
                self._lock = None
-               self._filename = os.path.join(os.sep, root, WORLD_FILE)
+               self._filename = os.path.join(os.sep, eroot, WORLD_FILE)
                self.loader = ItemFileLoader(self._filename, self._validate)
                self._mtime = None
                
-               self._filename2 = os.path.join(os.sep, root, WORLD_SETS_FILE)
+               self._filename2 = os.path.join(os.sep, eroot, WORLD_SETS_FILE)
                self.loader2 = ItemFileLoader(self._filename2, self._validate2)
                self._mtime2 = None