Merge rev 113 from djanderson's genscripts repo

svn path=/trunk/gentoolkit/; revision=703

1 files changed, 16 insertions, 4 deletions

diff --git a/bin/equery b/bin/equery
index bac8a3a..e7bb6ce 100755
--- a/bin/equery
+++ b/bin/equery
@@ -2,9 +2,11 @@
 #
 # Copyright 2002-2009 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 or later
+#
+# $Header$
 
-"""equery is a flexible utility for Gentoo linux which can display various 
-information about packages, such as the files they own, their USE flags, 
+"""equery is a flexible utility for Gentoo linux which can display various
+information about packages, such as the files they own, their USE flags,
 the MD5 sum of each file owned by a given package, and many other things.
 """
 
@@ -27,6 +29,16 @@ except KeyboardInterrupt:
 	print
 	sys.exit(1)
 
-from gentoolkit import equery
+from gentoolkit import equery, errors
 
-equery.main() 
+try:
+	equery.main()
+except errors.GentoolkitException, err:
+	if '--debug' in sys.argv:
+		raise
+	else:
+		from gentoolkit import pprinter as pp
+		sys.stderr.write(pp.error(str(err)))
+		print
+		print "Add '--debug' to global options for traceback."
+		sys.exit(1)