diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-09-23 18:55:22 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-23 18:55:22 +0200 |
| commit | 6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3 (patch) | |
| tree | fe3db11874c6687507173287792fab55b5270e1c | |
| parent | Bug #337465 - Make EbuildIpcDaemon._input_handler() use os.read() (diff) | |
| download | portage-6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3.tar.gz portage-6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3.tar.bz2 portage-6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3.zip | |
always use eroot with CONFIG_MEMORY_FILE
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 320bb275a..aff4d86c2 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2770,7 +2770,7 @@ class dblink(object): @param srcroot: Typically this is ${D} @type srcroot: String (Path) - @param destroot: ignored, self._eroot is used instead + @param destroot: ignored, self.settings['ROOT'] is used instead @type destroot: String (Path) @param inforoot: root of the vardb entry ? @type inforoot: String (Path) @@ -3188,7 +3188,7 @@ class dblink(object): self.updateprotect() #if we have a file containing previously-merged config file md5sums, grab it. - conf_mem_file = os.path.join(destroot, CONFIG_MEMORY_FILE) + conf_mem_file = os.path.join(self._eroot, CONFIG_MEMORY_FILE) cfgfiledict = grabdict(conf_mem_file) cfgfiledict_orig = cfgfiledict.copy() if "NOCONFMEM" in self.settings: |