Fix portage creating multiple levels of prefixes. PRIVATE_PATH etc are

already prefixed, so don't prefix them again.

svn path=/main/branches/prefix/; revision=7586

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 65a226fff50f8ea152bc74ecec396e38b767b82a..26ef8c25d29e8b16b574af46eef96ed6ff29b88b 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1507,15 +1507,15 @@ class config(object):
                        return
 
                dir_mode_map = {
-                       "tmp"             : (-1,          01777, 0),
-                       "var/tmp"         : (-1,          01777, 0),
-                       PRIVATE_PATH      : (portage_gid, 02750, 02),
+                       EPREFIX_LSTRIP+"/tmp"      : (-1,          01777, 0),
+                       EPREFIX_LSTRIP+"/var/tmp"  : (-1,          01777, 0),
+                       PRIVATE_PATH               : (portage_gid, 02750, 02),
                        CACHE_PATH.lstrip(os.path.sep) : (portage_gid, 0755, 02)
                }
 
                for mypath, (gid, mode, modemask) in dir_mode_map.iteritems():
                        try:
-                               mydir = normalize_path(os.path.join(self["ROOT"] + EPREFIX, mypath))
+                               mydir = normalize_path(os.path.join(self["ROOT"], mypath))
                                portage.util.ensure_dirs(mydir, gid=gid, mode=mode, mask=modemask)
                        except portage.exception.PortageException, e:
                                writemsg("!!! Directory initialization failed: '%s'\n" % mydir,