From: Fabian Groffen Date: Fri, 10 Aug 2007 17:13:35 +0000 (-0000) Subject: Fix portage creating multiple levels of prefixes. PRIVATE_PATH etc are X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ff727327674c104ebbd563399624e518249a4d52;p=portage.git 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 65a226fff..26ef8c25d 100644 --- 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,