From 5b3135413d200e58e602a74a6816e48380e53433 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Dec 2007 23:26:05 +0000 Subject: Instead of calling sys.exit when a ParseError occurs in the config constructor, raise a ParseError and make emerge and portageq handle the error. This way consumers of the portage api can handle the ParseError rather than have their application exit. Thanks to lxnay for reporting. svn path=/main/trunk/; revision=8884 --- bin/emerge | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 5901c2379..1ef575e13 100755 --- a/bin/emerge +++ b/bin/emerge @@ -13,10 +13,13 @@ except ImportError: if __name__ == "__main__": import sys - from portage.exception import PermissionDenied + from portage.exception import ParseError, PermissionDenied try: retval = _emerge.emerge_main() except PermissionDenied, e: sys.stderr.write("Permission denied: '%s'\n" % str(e)) sys.exit(e.errno) + except ParseError, e: + sys.stderr.write("%s\n" % str(e)) + sys.exit(1) sys.exit(retval) -- cgit v1.2.3-65-gdbad