[gentoo-commits] portage r10383 - main/trunk/pym/portage/sets

[gentoo-commits] portage r10383 - main/trunk/pym/portage/sets

[Marius Mauch (genone)]

Author: genone
Date: 2008-05-21 16:05:03 +0000 (Wed, 21 May 2008)
New Revision: 10383

Modified:
   main/trunk/pym/portage/sets/files.py
Log:
Raise an error if the named repository doesn't exist

Modified: main/trunk/pym/portage/sets/files.py
===================================================================
--- main/trunk/pym/portage/sets/files.py	2008-05-20 19:52:59 UTC (rev 10382)
+++ main/trunk/pym/portage/sets/files.py	2008-05-21 16:05:03 UTC (rev 10383)
@@ -101,7 +101,10 @@
 		# look for repository path variables
 		match = self._repopath_match.match(filename)
 		if match:
-			filename = self._repopath_sub.sub(trees["porttree"].dbapi.treemap[match.groupdict()["reponame"]], filename)
+			try:
+				filename = self._repopath_sub.sub(trees["porttree"].dbapi.treemap[match.groupdict()["reponame"]], filename)
+			except KeyError:
+				raise SetConfigError("Could not find repository '%s'" % match.groupdict()["reponame"])
 		return StaticFileSet(filename, greedy=greedy, dbapi=trees["vartree"].dbapi)
 	singleBuilder = classmethod(singleBuilder)
 	
@@ -115,7 +118,10 @@
 		# look for repository path variables
 		match = self._repopath_match.match(directory)
 		if match:
-			directory = self._repopath_sub.sub(trees["porttree"].dbapi.treemap[match.groupdict()["reponame"]], directory)
+			try:
+				directory = self._repopath_sub.sub(trees["porttree"].dbapi.treemap[match.groupdict()["reponame"]], directory)
+			except KeyError:
+				raise SetConfigError("Could not find repository '%s'" % match.groupdict()["reponame"])
 		if os.path.isdir(directory):
 			for filename in os.listdir(directory):
 				if filename.endswith(".metadata"):

-- 
gentoo-commits@lists.gentoo.org mailing list