Remove the leading / from CONFIG_MEMORY_FILE for better cooperation with os.path...

svn path=/main/trunk/; revision=2816

diff --git a/pym/portage.py b/pym/portage.py
index e68a6d0485937424521aa4e289741ff59e2a7715..850800f89a2007697f9bd0de17f8d3dbcc7f34dc 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5984,10 +5984,7 @@ class dblink:
                self.updateprotect()
 
                #if we have a file containing previously-merged config file md5sums, grab it.
-               if os.path.exists(destroot+CONFIG_MEMORY_FILE):
-                       cfgfiledict=grabdict(destroot+CONFIG_MEMORY_FILE)
-               else:
-                       cfgfiledict={}
+               cfgfiledict = grabdict(os.path.join(destroot, CONFIG_MEMORY_FILE))
                if self.settings.has_key("NOCONFMEM"):
                        cfgfiledict["IGNORE"]=1
                else:
@@ -6055,8 +6052,8 @@ class dblink:
                        os.chown(my_private_path, os.getuid(), portage_gid)
                        os.chmod(my_private_path, 02770)
 
-               mylock = portage_locks.lockfile(destroot+CONFIG_MEMORY_FILE)
-               writedict(cfgfiledict,destroot+CONFIG_MEMORY_FILE)
+               mylock = portage_locks.lockfile(os.path.join(destroot, CONFIG_MEMORY_FILE))
+               writedict(cfgfiledict, os.path.join(destroot, CONFIG_MEMORY_FILE))
                portage_locks.unlockfile(mylock)
 
                #do postinst script

diff --git a/pym/portage_const.py b/pym/portage_const.py
index 1b5459f455fef876eab258c83f52de437790439b..c3c768620919dc0430d1895877af4e544f0ed76c 100644 (file)
--- a/pym/portage_const.py
+++ b/pym/portage_const.py
@@ -37,7 +37,7 @@ USER_VIRTUALS_FILE      = USER_CONFIG_PATH+"/virtuals"
 EBUILD_SH_ENV_FILE      = USER_CONFIG_PATH+"/bashrc"
 INVALID_ENV_FILE        = "/etc/spork/is/not/valid/profile.env"
 CUSTOM_MIRRORS_FILE     = USER_CONFIG_PATH+"/mirrors"
-CONFIG_MEMORY_FILE      = "/" + PRIVATE_PATH + "/config"
+CONFIG_MEMORY_FILE      = PRIVATE_PATH + "/config"
 
 INCREMENTALS=["USE","USE_EXPAND","USE_EXPAND_HIDDEN","FEATURES","ACCEPT_KEYWORDS","ACCEPT_LICENSE","CONFIG_PROTECT_MASK","CONFIG_PROTECT","PRELINK_PATH","PRELINK_PATH_MASK"]
 STICKIES=["KEYWORDS_ACCEPT","USE","CFLAGS","CXXFLAGS","MAKEOPTS","EXTRA_ECONF","EXTRA_EINSTALL","EXTRA_EMAKE"]