From f50cce1c33cd112e55942cff8014e9cf5b88fbef Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 5 Sep 2009 11:06:05 +0000 Subject: [PATCH] PRIVATE_PATH is used with ROOT, so it should include EPREFIX svn path=/main/branches/prefix/; revision=14196 --- pym/portage/__init__.py | 2 +- pym/portage/const.py | 2 +- pym/portage/dbapi/vartree.py | 2 +- pym/portage/sets/files.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index fd958d170..d69ef042d 100644 --- 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 a7519c691..7a2c45bbf 100644 --- 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 7399d1ca8..91262c200 100644 --- 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 18283fd19..34722ed9a 100644 --- 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 -- 2.26.2