[gentoo-commits] gentoolkit r762 - in trunk/gentoolkit: . bin

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2010-03-31 12:45:41 +0000 (Wed, 31 Mar 2010)
New Revision: 762

Modified:
   trunk/gentoolkit/ChangeLog
   trunk/gentoolkit/bin/epkginfo
Log:
epkginfo: Fix epkginfo to handle ambiguous package names.

Modified: trunk/gentoolkit/ChangeLog
===================================================================
--- trunk/gentoolkit/ChangeLog	2010-03-30 11:15:33 UTC (rev 761)
+++ trunk/gentoolkit/ChangeLog	2010-03-31 12:45:41 UTC (rev 762)
@@ -1,3 +1,6 @@
[phone]: Christian Ruppert <idl0r@g.o>
+	* epkginfo: Fix epkginfo to handle ambiguous package names.
+
 2010-03-09: Paul Varner <fuzzyray@g.o>
 	* gentoolkit: Add inital py3k support.
 	* analyse: Add new analyse utility from dol-sen. This will probably

Modified: trunk/gentoolkit/bin/epkginfo
===================================================================
--- trunk/gentoolkit/bin/epkginfo	2010-03-30 11:15:33 UTC (rev 761)
+++ trunk/gentoolkit/bin/epkginfo	2010-03-31 12:45:41 UTC (rev 762)
@@ -21,6 +21,7 @@
 from gentoolkit import equery, errors
 from gentoolkit.equery import mod_usage
 from gentoolkit.equery.meta import main, print_help
+from portage.exception import AmbiguousPackageName
 
 def print_epkginfo_help():
 	print(mod_usage(mod_name="epkginfo"))
@@ -34,6 +35,18 @@
 else:
 	try:
 		main(args)
+	except AmbiguousPackageName as e:
+		pkgs = e.args[0]
+		for candidate in pkgs:
+			print(candidate)
+
+		from gentoolkit import pprinter as pp
+		from os.path import basename # To get the short name
+
+		print(file=sys.stderr)
+		print(pp.error("The short ebuild name '%s' is ambiguous. Please specify" % basename(pkgs[0])),
+				file=sys.stderr, end="")
+		pp.die(1, "one of the above fully-qualified ebuild names instead.")
 	except errors.GentoolkitException as err:
 		from gentoolkit import pprinter as pp
 		pp.die(1, str(err))