PRIVATE_PATH is used with ROOT, so it should include EPREFIX

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index fd958d170c1f91e88129f2e1882f19e05389d637..d69ef042d927a9cd1c835773808b966d01f7b0fd 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2217,7 +2217,7 @@ class config(object):
                dir_mode_map = {
                        EPREFIX_LSTRIP+"/tmp"           : (         -1, 01777,  0,  True),
                        EPREFIX_LSTRIP+"/var/tmp"       : (         -1, 01777,  0,  True),
-                       EPREFIX_LSTRIP+"/"+PRIVATE_PATH : (portage_gid, 02750, 02,  False),
+                       PRIVATE_PATH      : (portage_gid, 02750, 02,  False),
                        CACHE_PATH        : (portage_gid,  0755, 02,  False)
                }
 

diff --git a/pym/portage/const.py b/pym/portage/const.py
index a7519c691e71bbb070e166f6c07d00c28b34c1bf..7a2c45bbf5f3377b4e1aabc99e31f77fec0fc73b 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -59,7 +59,7 @@ DEPRECATED_PROFILE_FILE  = PROFILE_PATH + "/deprecated"
 VDB_PATH                 = EPREFIX_LSTRIP + "/" + "var/db/pkg"
 CACHE_PATH               = EPREFIX_LSTRIP + "/" + "var/cache/edb"
 DEPCACHE_PATH            = CACHE_PATH + "/dep"  # FIXME: does not seem to use ROOT when used
-PRIVATE_PATH             = "var/lib/portage"
+PRIVATE_PATH             = EPREFIX_LSTRIP + "/" + "var/lib/portage"
 WORLD_FILE               = PRIVATE_PATH + "/world"
 CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
 NEWS_LIB_PATH            = EPREFIX_LSTRIP + "/" + "var/lib/gentoo"

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 7399d1ca86a3a7836e4240c7301938bf2e315876..91262c200f47d133c5509fe19e00e36bd36b8732 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1528,7 +1528,7 @@ class vardbapi(dbapi):
 
                try:
                        self.plib_registry = PreservedLibsRegistry(self.root,
-                               os.path.join(self.root, EPREFIX_LSTRIP, PRIVATE_PATH, "preserved_libs_registry"))
+                               os.path.join(self.root, PRIVATE_PATH, "preserved_libs_registry"))
                except PermissionDenied:
                        # apparently this user isn't allowed to access PRIVATE_PATH
                        self.plib_registry = None

diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 18283fd19df22c204271c0a4d7ad2a5a0a085bc7..34722ed9a1100b6b53429da3e410c1f0bcc261be 100644 (file)
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -212,11 +212,11 @@ class WorldSet(EditablePackageSet):
                # most attributes exist twice as atoms and non-atoms are stored in 
                # separate files
                self._lock = None
-               self._filename = os.path.join(os.sep, root, EPREFIX_LSTRIP, PRIVATE_PATH, "world")
+               self._filename = os.path.join(os.sep, root, PRIVATE_PATH, "world")
                self.loader = ItemFileLoader(self._filename, self._validate)
                self._mtime = None
                
-               self._filename2 = os.path.join(os.sep, root, EPREFIX_LSTRIP,  PRIVATE_PATH, "world_sets")
+               self._filename2 = os.path.join(os.sep, root, PRIVATE_PATH, "world_sets")
                self.loader2 = ItemFileLoader(self._filename2, self._validate2)
                self._mtime2 = None