diff options
| author | Fabian Groffen <grobian@gentoo.org> | 2010-09-04 20:08:35 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-04 20:08:35 +0200 |
| commit | 4c365322a910333edf7928f9ce228d5e9af24608 (patch) | |
| tree | 92af89651a3c13e6460efbceaa61f76bd7b2d09b | |
| parent | f8f1d8c4ffd6848297e810181707adf87e442bb6 (diff) | |
| download | portage-4c365322a910333edf7928f9ce228d5e9af24608.tar.gz portage-4c365322a910333edf7928f9ce228d5e9af24608.tar.bz2 portage-4c365322a910333edf7928f9ce228d5e9af24608.zip | |
use EROOT with WORLD_FILE
| -rwxr-xr-x | bin/emaint | 2 | ||||
| -rw-r--r-- | pym/portage/_global_updates.py | 2 | ||||
| -rw-r--r-- | pym/portage/_sets/files.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bin/emaint b/bin/emaint index aa2e9a5c8..f11829897 100755 --- 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 ed5141121..b06cab36f 100644 --- 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 c474f1b5f..21993316b 100644 --- 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 |