diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-05-30 02:40:15 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-05-30 02:40:15 +0200 |
| commit | 587cce4816afc7d57b3edf0be6c0670ec0be89c9 (patch) | |
| tree | e5bf411a4a32e82ee67b9d6cc6bb1909e72c3aff /pym/portage/dep | |
| parent | repoman: add a mini framework for checking eclasses, and fill it out (diff) | |
| download | portage-587cce4816afc7d57b3edf0be6c0670ec0be89c9.tar.gz portage-587cce4816afc7d57b3edf0be6c0670ec0be89c9.tar.bz2 portage-587cce4816afc7d57b3edf0be6c0670ec0be89c9.zip | |
portage.dep.Atom: Ignore allow_repo argument when non-None eapi is passed.
Allow repository when allow_repo=False is not passed and eapi=None is passed.
Diffstat (limited to 'pym/portage/dep')
| -rw-r--r-- | pym/portage/dep/__init__.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 152af0aa8..d29a4c4a1 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1068,11 +1068,11 @@ class Atom(_atom_base): def __init__(self, forbid_overlap=False): self.overlap = self._overlap(forbid=forbid_overlap) - def __new__(cls, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=False, + def __new__(cls, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=None, _use=None, eapi=None, is_valid_flag=None): return _atom_base.__new__(cls, s) - def __init__(self, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=False, + def __init__(self, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=None, _use=None, eapi=None, is_valid_flag=None): if isinstance(s, Atom): # This is an efficiency assertion, to ensure that the Atom @@ -1087,8 +1087,13 @@ class Atom(_atom_base): _atom_base.__init__(s) atom_re = _get_atom_re(eapi) - if eapi_has_repo_deps(eapi): - allow_repo = True + + if eapi is not None: + # Ignore allow_repo when eapi is specified. + allow_repo = eapi_has_repo_deps(eapi) + else: + if allow_repo is None: + allow_repo = True if "!" == s[:1]: blocker = self._blocker(forbid_overlap=("!" == s[1:2])) |