[gentoo-commits] portage r11670 - main/trunk/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-10-10 20:15:43 +0000 (Fri, 10 Oct 2008)
New Revision: 11670

Modified:
   main/trunk/pym/portage/__init__.py
   main/trunk/pym/portage/exception.py
Log:
Create a new AmbiguousPackageName exception to raise from
portage.cpv_expand(). It inherits from ValueError, for
backward compatibility with calling code that already
handles ValueError.


Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2008-10-09 23:29:54 UTC (rev 11669)
+++ main/trunk/pym/portage/__init__.py	2008-10-10 20:15:43 UTC (rev 11670)
@@ -6617,7 +6617,10 @@
 					else:
 						virtual_name_collision = True
 			if not virtual_name_collision:
-				raise ValueError, matches
+				# AmbiguousPackageName inherits from ValueError,
+				# for backward compatibility with calling code
+				# that already handles ValueError.
+				raise portage.exception.AmbiguousPackageName(matches)
 		elif matches:
 			mykey=matches[0]
 

Modified: main/trunk/pym/portage/exception.py
===================================================================
--- main/trunk/pym/portage/exception.py	2008-10-09 23:29:54 UTC (rev 11669)
+++ main/trunk/pym/portage/exception.py	2008-10-10 20:15:43 UTC (rev 11670)
@@ -67,6 +67,13 @@
 class CommandNotFound(PortageException):
 	"""A required binary was not available or executable"""
 
+class AmbiguousPackageName(ValueError, PortageException):
+	"""Raised by portage.cpv_expand() when the package name is ambiguous due
+	to the existence of multiple matches in different categories. This inherits
+	from ValueError, for backward compatibility with calling code that already
+	handles ValueError."""
+	def __str__(self):
+		return ValueError.__str__(self)
 
 class PortagePackageException(PortageException):
 	"""Malformed or missing package data"""