always use eroot with CONFIG_MEMORY_FILE
authorFabian Groffen <grobian@gentoo.org>
Thu, 23 Sep 2010 16:55:22 +0000 (18:55 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 23 Sep 2010 16:55:22 +0000 (18:55 +0200)
pym/portage/dbapi/vartree.py

index 320bb275aeea0eb82a540e2098fb198f8502882b..aff4d86c25bfeb431f63d70944f61bffaf0ca086 100644 (file)
@@ -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: