From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qf5KV-0005C6-DQ for garchives@archives.gentoo.org; Fri, 08 Jul 2011 07:18:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF7DC21C028; Fri, 8 Jul 2011 07:18:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C49FE21C028 for ; Fri, 8 Jul 2011 07:18:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5714F2AC0D0 for ; Fri, 8 Jul 2011 07:18:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A49B08003F for ; Fri, 8 Jul 2011 07:18:18 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/paludispm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/paludispm/atom.py X-VCS-Directories: gentoopm/paludispm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b6feaf9e3476a4cb6166ea80a206b090a5f5b299 Date: Fri, 8 Jul 2011 07:18:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: be783d10d6857079a1e4a35d61249a9e commit: b6feaf9e3476a4cb6166ea80a206b090a5f5b299 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Jul 8 07:06:23 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Jul 8 07:06:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Db6feaf9e 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=C5=82 G=C3=B3rny # Released under the terms of the 2-clause BSD license. =20 -import paludis +import paludis, re =20 from gentoopm.basepm.atom import PMAtom =20 +_category_wildcard_re =3D re.compile(r'\w') + class PaludisAtom(PMAtom): - def __init__(self, s, pm): + def _init_atom(self, s, pm, wildcards =3D False): + opts =3D paludis.UserPackageDepSpecOptions() \ + + paludis.UserPackageDepSpecOption.NO_DISAMBIGUATION + if wildcards: + opts +=3D paludis.UserPackageDepSpecOption.ALLOW_WILDCARDS + try: self._atom =3D 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= ) =20 def __contains__(self, pkg): raise NotImplementedError('Direct atom matching not implemented in Pal= udis')