From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 5 Sep 2009 11:13:33 +0000 (-0000)
Subject: pym/portage/sets/files.py: use WORLD_FILE instead of manual reconstruction
X-Git-Tag: v2.2_rc41~69
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=119111ee91e9defbcbcc1795155a54e2a521c83b;p=portage.git

pym/portage/sets/files.py: use WORLD_FILE instead of manual 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/trunk/; revision=14197
---

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index 2c9e7576e..cfa57bbc7 100644
--- 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 a6ac8e8c2..e0c34e494 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -48,6 +48,7 @@ CACHE_PATH               = "var/cache/edb"
 DEPCACHE_PATH            = CACHE_PATH + "/dep"  # FIXME: does not seem to use ROOT when used
 PRIVATE_PATH             = "var/lib/portage"
 WORLD_FILE               = PRIVATE_PATH + "/world"
+WORLD_SETS_FILE          = PRIVATE_PATH + "/world_sets"
 CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
 NEWS_LIB_PATH            = "var/lib/gentoo"
 
diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 7c5a6c766..13c8508e0 100644
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -11,7 +11,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
+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
@@ -213,11 +213,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