summaryrefslogtreecommitdiffstats
path: root/pym/portage/dep
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-10-12 16:34:37 +0200
committerZac Medico <zmedico@gentoo.org>2010-10-12 08:36:07 -0700
commit13265b866e87e132ff6fb0726e3773f490a2b90c (patch)
tree74b3093de03c72166155ef389e5acb1c061128f7 /pym/portage/dep
parent7f7fb4ca3420e6c65219dd80bb031be7cfeb3c89 (diff)
downloadportage-13265b866e87e132ff6fb0726e3773f490a2b90c.tar.gz
portage-13265b866e87e132ff6fb0726e3773f490a2b90c.tar.bz2
portage-13265b866e87e132ff6fb0726e3773f490a2b90c.zip
Allow repository specs for atoms with wildcards
Diffstat (limited to 'pym/portage/dep')
-rw-r--r--pym/portage/dep/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 268ebb643..b829e8045 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -1010,7 +1010,7 @@ class Atom(_atom_base):
if cpv.find("**") != -1:
raise InvalidAtom(self)
slot = gdict['slot']
- repo = None
+ repo = gdict['repo']
use_str = None
extended_syntax = True
else:
@@ -1529,7 +1529,7 @@ _atom_re = re.compile('^(?P<without_use>(?:' +
_extended_cat = r'[\w+*][\w+.*-]*'
_extended_pkg = r'[\w+*][\w+*-]*?'
-_atom_wildcard_re = re.compile('(?P<simple>(' + _extended_cat + ')/(' + _extended_pkg + '))(:(?P<slot>' + _slot + '))?$')
+_atom_wildcard_re = re.compile('(?P<simple>(' + _extended_cat + ')/(' + _extended_pkg + '))(:(?P<slot>' + _slot + '))?(' + _repo_separator + '(?P<repo>' + _repo_name + '))?$')
_valid_use_re = re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@-]*$')