| 1 |
Author: grobian |
| 2 |
Date: 2009-09-05 11:15:48 +0000 (Sat, 05 Sep 2009) |
| 3 |
New Revision: 14198 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/_emerge/unmerge.py |
| 7 |
main/branches/prefix/pym/portage/const.py |
| 8 |
main/branches/prefix/pym/portage/sets/files.py |
| 9 |
Log: |
| 10 |
Merged from trunk -r14196:14197 |
| 11 |
|
| 12 |
| 14197 | pym/portage/sets/files.py: use WORLD_FILE instead of manual | |
| 13 |
| grobian | reconstruction pym/portage/const.py: introduce | |
| 14 |
| | WORLD_SETS_FILE variable pym/portage/sets/files.py: use new | |
| 15 |
| | WORLD_SETS_FILE var pym/_emerge/unmerge.py: likewise | |
| 16 |
|
| 17 |
|
| 18 |
Modified: main/branches/prefix/pym/_emerge/unmerge.py |
| 19 |
=================================================================== |
| 20 |
--- main/branches/prefix/pym/_emerge/unmerge.py 2009-09-05 11:13:33 UTC (rev 14197) |
| 21 |
+++ main/branches/prefix/pym/_emerge/unmerge.py 2009-09-05 11:15:48 UTC (rev 14198) |
| 22 |
@@ -340,9 +340,8 @@ |
| 23 |
continue |
| 24 |
unknown_sets.add(s) |
| 25 |
out = portage.output.EOutput() |
| 26 |
- out.eerror(("Unknown set '@%s' in " + \ |
| 27 |
- "%svar/lib/portage/world_sets") % \ |
| 28 |
- (s, root_config.root)) |
| 29 |
+ out.eerror(("Unknown set '@%s' in %s%s") % \ |
| 30 |
+ (s, root_config.root, portage.const.WORLD_SETS_FILE)) |
| 31 |
continue |
| 32 |
|
| 33 |
# only check instances of EditablePackageSet as other classes are generally used for |
| 34 |
|
| 35 |
Modified: main/branches/prefix/pym/portage/const.py |
| 36 |
=================================================================== |
| 37 |
--- main/branches/prefix/pym/portage/const.py 2009-09-05 11:13:33 UTC (rev 14197) |
| 38 |
+++ main/branches/prefix/pym/portage/const.py 2009-09-05 11:15:48 UTC (rev 14198) |
| 39 |
@@ -61,6 +61,7 @@ |
| 40 |
DEPCACHE_PATH = CACHE_PATH + "/dep" # FIXME: does not seem to use ROOT when used |
| 41 |
PRIVATE_PATH = EPREFIX_LSTRIP + "/" + "var/lib/portage" |
| 42 |
WORLD_FILE = PRIVATE_PATH + "/world" |
| 43 |
+WORLD_SETS_FILE = PRIVATE_PATH + "/world_sets" |
| 44 |
CONFIG_MEMORY_FILE = PRIVATE_PATH + "/config" |
| 45 |
NEWS_LIB_PATH = EPREFIX_LSTRIP + "/" + "var/lib/gentoo" |
| 46 |
|
| 47 |
|
| 48 |
Modified: main/branches/prefix/pym/portage/sets/files.py |
| 49 |
=================================================================== |
| 50 |
--- main/branches/prefix/pym/portage/sets/files.py 2009-09-05 11:13:33 UTC (rev 14197) |
| 51 |
+++ main/branches/prefix/pym/portage/sets/files.py 2009-09-05 11:15:48 UTC (rev 14198) |
| 52 |
@@ -10,7 +10,7 @@ |
| 53 |
from portage import _unicode_decode |
| 54 |
from portage import _unicode_encode |
| 55 |
from portage.util import grabfile, write_atomic, ensure_dirs, normalize_path |
| 56 |
-from portage.const import PRIVATE_PATH, USER_CONFIG_PATH, EPREFIX_LSTRIP |
| 57 |
+from portage.const import USER_CONFIG_PATH, WORLD_FILE, WORLD_SETS_FILE |
| 58 |
from portage.localization import _ |
| 59 |
from portage.locks import lockfile, unlockfile |
| 60 |
from portage import portage_gid |
| 61 |
@@ -212,11 +212,11 @@ |
| 62 |
# most attributes exist twice as atoms and non-atoms are stored in |
| 63 |
# separate files |
| 64 |
self._lock = None |
| 65 |
- self._filename = os.path.join(os.sep, root, PRIVATE_PATH, "world") |
| 66 |
+ self._filename = os.path.join(os.sep, root, WORLD_FILE) |
| 67 |
self.loader = ItemFileLoader(self._filename, self._validate) |
| 68 |
self._mtime = None |
| 69 |
|
| 70 |
- self._filename2 = os.path.join(os.sep, root, PRIVATE_PATH, "world_sets") |
| 71 |
+ self._filename2 = os.path.join(os.sep, root, WORLD_SETS_FILE) |
| 72 |
self.loader2 = ItemFileLoader(self._filename2, self._validate2) |
| 73 |
self._mtime2 = None |
Archives