summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-06-01 15:51:36 +0000
committerZac Medico <zmedico@gentoo.org>2007-06-01 15:51:36 +0000
commit2f2acc41ca47529dc58d69573988113a0ff2d912 (patch)
tree29f8e5afb98b9ed7c1ac8e19efb951c5a5e213d0
parente29a91aad89df64d18b5631035e7cf6e8198939c (diff)
downloadportage-2f2acc41ca47529dc58d69573988113a0ff2d912.tar.gz
portage-2f2acc41ca47529dc58d69573988113a0ff2d912.tar.bz2
portage-2f2acc41ca47529dc58d69573988113a0ff2d912.zip
Instead of calling sys.exit() when aux_get() fails inside getfetchlist(), convert the KeyError to an InvalidDependString exception since callers already handle it.
svn path=/main/trunk/; revision=6708
-rw-r--r--pym/portage/dbapi/porttree.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 5488251e6..6130dd49d 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -362,8 +362,10 @@ class portdbapi(dbapi):
try:
myuris = self.aux_get(mypkg, ["SRC_URI"], mytree=mytree)[0]
except KeyError:
- print red("getfetchlist():")+" aux_get() error reading "+mypkg+"; aborting."
- sys.exit(1)
+ # Convert this to an InvalidDependString exception since callers
+ # already handle it.
+ raise portage.exception.InvalidDependString(
+ "getfetchlist(): aux_get() error reading "+mypkg+"; aborting.")
if useflags is None:
useflags = mysettings["USE"].split()