| 1 |
Author: grobian |
| 2 |
Date: 2009-09-05 11:06:05 +0000 (Sat, 05 Sep 2009) |
| 3 |
New Revision: 14196 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/portage/__init__.py |
| 7 |
main/branches/prefix/pym/portage/const.py |
| 8 |
main/branches/prefix/pym/portage/dbapi/vartree.py |
| 9 |
main/branches/prefix/pym/portage/sets/files.py |
| 10 |
Log: |
| 11 |
PRIVATE_PATH is used with ROOT, so it should include EPREFIX |
| 12 |
|
| 13 |
Modified: main/branches/prefix/pym/portage/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/branches/prefix/pym/portage/__init__.py 2009-09-05 11:00:20 UTC (rev 14195) |
| 16 |
+++ main/branches/prefix/pym/portage/__init__.py 2009-09-05 11:06:05 UTC (rev 14196) |
| 17 |
@@ -2217,7 +2217,7 @@ |
| 18 |
dir_mode_map = { |
| 19 |
EPREFIX_LSTRIP+"/tmp" : ( -1, 01777, 0, True), |
| 20 |
EPREFIX_LSTRIP+"/var/tmp" : ( -1, 01777, 0, True), |
| 21 |
- EPREFIX_LSTRIP+"/"+PRIVATE_PATH : (portage_gid, 02750, 02, False), |
| 22 |
+ PRIVATE_PATH : (portage_gid, 02750, 02, False), |
| 23 |
CACHE_PATH : (portage_gid, 0755, 02, False) |
| 24 |
} |
| 25 |
|
| 26 |
|
| 27 |
Modified: main/branches/prefix/pym/portage/const.py |
| 28 |
=================================================================== |
| 29 |
--- main/branches/prefix/pym/portage/const.py 2009-09-05 11:00:20 UTC (rev 14195) |
| 30 |
+++ main/branches/prefix/pym/portage/const.py 2009-09-05 11:06:05 UTC (rev 14196) |
| 31 |
@@ -59,7 +59,7 @@ |
| 32 |
VDB_PATH = EPREFIX_LSTRIP + "/" + "var/db/pkg" |
| 33 |
CACHE_PATH = EPREFIX_LSTRIP + "/" + "var/cache/edb" |
| 34 |
DEPCACHE_PATH = CACHE_PATH + "/dep" # FIXME: does not seem to use ROOT when used |
| 35 |
-PRIVATE_PATH = "var/lib/portage" |
| 36 |
+PRIVATE_PATH = EPREFIX_LSTRIP + "/" + "var/lib/portage" |
| 37 |
WORLD_FILE = PRIVATE_PATH + "/world" |
| 38 |
CONFIG_MEMORY_FILE = PRIVATE_PATH + "/config" |
| 39 |
NEWS_LIB_PATH = EPREFIX_LSTRIP + "/" + "var/lib/gentoo" |
| 40 |
|
| 41 |
Modified: main/branches/prefix/pym/portage/dbapi/vartree.py |
| 42 |
=================================================================== |
| 43 |
--- main/branches/prefix/pym/portage/dbapi/vartree.py 2009-09-05 11:00:20 UTC (rev 14195) |
| 44 |
+++ main/branches/prefix/pym/portage/dbapi/vartree.py 2009-09-05 11:06:05 UTC (rev 14196) |
| 45 |
@@ -1528,7 +1528,7 @@ |
| 46 |
|
| 47 |
try: |
| 48 |
self.plib_registry = PreservedLibsRegistry(self.root, |
| 49 |
- os.path.join(self.root, EPREFIX_LSTRIP, PRIVATE_PATH, "preserved_libs_registry")) |
| 50 |
+ os.path.join(self.root, PRIVATE_PATH, "preserved_libs_registry")) |
| 51 |
except PermissionDenied: |
| 52 |
# apparently this user isn't allowed to access PRIVATE_PATH |
| 53 |
self.plib_registry = None |
| 54 |
|
| 55 |
Modified: main/branches/prefix/pym/portage/sets/files.py |
| 56 |
=================================================================== |
| 57 |
--- main/branches/prefix/pym/portage/sets/files.py 2009-09-05 11:00:20 UTC (rev 14195) |
| 58 |
+++ main/branches/prefix/pym/portage/sets/files.py 2009-09-05 11:06:05 UTC (rev 14196) |
| 59 |
@@ -212,11 +212,11 @@ |
| 60 |
# most attributes exist twice as atoms and non-atoms are stored in |
| 61 |
# separate files |
| 62 |
self._lock = None |
| 63 |
- self._filename = os.path.join(os.sep, root, EPREFIX_LSTRIP, PRIVATE_PATH, "world") |
| 64 |
+ self._filename = os.path.join(os.sep, root, PRIVATE_PATH, "world") |
| 65 |
self.loader = ItemFileLoader(self._filename, self._validate) |
| 66 |
self._mtime = None |
| 67 |
|
| 68 |
- self._filename2 = os.path.join(os.sep, root, EPREFIX_LSTRIP, PRIVATE_PATH, "world_sets") |
| 69 |
+ self._filename2 = os.path.join(os.sep, root, PRIVATE_PATH, "world_sets") |
| 70 |
self.loader2 = ItemFileLoader(self._filename2, self._validate2) |
| 71 |
self._mtime2 = None |
Archives