Merged from trunk -r14196:14197

   | 14197   | pym/portage/sets/files.py: use WORLD_FILE instead of manual  |
   | grobian | reconstruction pym/portage/const.py: introduce               |
   |         | WORLD_SETS_FILE variable pym/portage/sets/files.py: use new  |
   |         | WORLD_SETS_FILE var pym/_emerge/unmerge.py: likewise         |

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

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index 2c9e7576e9b5db31a0ff329db44d1fb2a264eeff..cfa57bbc7105d4b844555de8f9fbb095cfd4caf4 100644 (file)
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -340,9 +340,8 @@ def unmerge(root_config, myopts, unmerge_action,
                                                continue
                                        unknown_sets.add(s)
                                        out = portage.output.EOutput()
-                                       out.eerror(("Unknown set '@%s' in " + \
-                                               "%svar/lib/portage/world_sets") % \
-                                               (s, root_config.root))
+                                       out.eerror(("Unknown set '@%s' in %s%s") % \
+                                               (s, root_config.root, portage.const.WORLD_SETS_FILE))
                                        continue
 
                                # only check instances of EditablePackageSet as other classes are generally used for

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 7a2c45bbf5f3377b4e1aabc99e31f77fec0fc73b..81fd1c8738250935ef0fe3b8986ec35de4bcd26a 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -61,6 +61,7 @@ CACHE_PATH               = EPREFIX_LSTRIP + "/" + "var/cache/edb"
 DEPCACHE_PATH            = CACHE_PATH + "/dep"  # FIXME: does not seem to use ROOT when used
 PRIVATE_PATH             = EPREFIX_LSTRIP + "/" + "var/lib/portage"
 WORLD_FILE               = PRIVATE_PATH + "/world"
+WORLD_SETS_FILE          = PRIVATE_PATH + "/world_sets"
 CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
 NEWS_LIB_PATH            = EPREFIX_LSTRIP + "/" + "var/lib/gentoo"
 

diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 34722ed9a1100b6b53429da3e410c1f0bcc261be..3d0f895046152234a5aea0061eb272f6d93c0811 100644 (file)
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -10,7 +10,7 @@ from portage import _encodings
 from portage import _unicode_decode
 from portage import _unicode_encode
 from portage.util import grabfile, write_atomic, ensure_dirs, normalize_path
-from portage.const import PRIVATE_PATH, USER_CONFIG_PATH, EPREFIX_LSTRIP
+from portage.const import USER_CONFIG_PATH, WORLD_FILE, WORLD_SETS_FILE
 from portage.localization import _
 from portage.locks import lockfile, unlockfile
 from portage import portage_gid
@@ -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, PRIVATE_PATH, "world")
+               self._filename = os.path.join(os.sep, root, WORLD_FILE)
                self.loader = ItemFileLoader(self._filename, self._validate)
                self._mtime = None
                
-               self._filename2 = os.path.join(os.sep, root, PRIVATE_PATH, "world_sets")
+               self._filename2 = os.path.join(os.sep, root, WORLD_SETS_FILE)
                self.loader2 = ItemFileLoader(self._filename2, self._validate2)
                self._mtime2 = None