[gentoo-commits] proj/gentoopm:master commit in: gentoopm/paludispm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     b6feaf9e3476a4cb6166ea80a206b090a5f5b299
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 07:06:23 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 07:06:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=b6feaf9e

Paludis: use wildcard atoms for category unspecified.

Instead of expanding category, use '*' wildcard.

---
 gentoopm/paludispm/atom.py |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/gentoopm/paludispm/atom.py b/gentoopm/paludispm/atom.py
index 5e1949d..a67a308 100644
--- a/gentoopm/paludispm/atom.py
+++ b/gentoopm/paludispm/atom.py
@@ -3,23 +3,33 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
-import paludis
+import paludis, re
 
 from gentoopm.basepm.atom import PMAtom
 
+_category_wildcard_re = re.compile(r'\w')
+
 class PaludisAtom(PMAtom):
-	def __init__(self, s, pm):
+	def _init_atom(self, s, pm, wildcards = False):
+		opts = paludis.UserPackageDepSpecOptions() \
+				+ paludis.UserPackageDepSpecOption.NO_DISAMBIGUATION
+		if wildcards:
+			opts += paludis.UserPackageDepSpecOption.ALLOW_WILDCARDS
+
 		try:
 			self._atom = paludis.parse_user_package_dep_spec(
-					s, pm._env,
-					paludis.UserPackageDepSpecOptions(),
+					s, pm._env, opts,
 					paludis.Filter.All())
-		except (paludis.BadVersionOperatorError, paludis.PackageDepSpecError):
+		except (paludis.BadVersionOperatorError, paludis.PackageDepSpecError,
+				paludis.RepositoryNameError):
 			raise ValueError('Incorrect atom: %s' % s)
-		except paludis.AmbiguousPackageNameError:
-			raise KeyError('Ambiguous atom: %s' % s)
-		except paludis.NoSuchPackageError:
-			raise KeyError('Unable to expand atom: %s' % s)
+
+	def __init__(self, s, pm):
+		try:
+			self._init_atom(s, pm)
+		except ValueError:
+			# try */ for the category
+			self._init_atom(_category_wildcard_re.sub(r'*/\g<0>', s, 1), pm, True)
 
 	def __contains__(self, pkg):
 		raise NotImplementedError('Direct atom matching not implemented in Paludis')