| 1 |
commit: 587cce4816afc7d57b3edf0be6c0670ec0be89c9 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Wed May 30 00:40:15 2012 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed May 30 00:40:15 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=587cce48 |
| 7 |
|
| 8 |
portage.dep.Atom: Ignore allow_repo argument when non-None eapi is passed. |
| 9 |
Allow repository when allow_repo=False is not passed and eapi=None is passed. |
| 10 |
|
| 11 |
--- |
| 12 |
pym/portage/dep/__init__.py | 13 +++++++++---- |
| 13 |
1 files changed, 9 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py |
| 16 |
index 152af0a..d29a4c4 100644 |
| 17 |
--- a/pym/portage/dep/__init__.py |
| 18 |
+++ b/pym/portage/dep/__init__.py |
| 19 |
@@ -1068,11 +1068,11 @@ class Atom(_atom_base): |
| 20 |
def __init__(self, forbid_overlap=False): |
| 21 |
self.overlap = self._overlap(forbid=forbid_overlap) |
| 22 |
|
| 23 |
- def __new__(cls, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=False, |
| 24 |
+ def __new__(cls, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=None, |
| 25 |
_use=None, eapi=None, is_valid_flag=None): |
| 26 |
return _atom_base.__new__(cls, s) |
| 27 |
|
| 28 |
- def __init__(self, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=False, |
| 29 |
+ def __init__(self, s, unevaluated_atom=None, allow_wildcard=False, allow_repo=None, |
| 30 |
_use=None, eapi=None, is_valid_flag=None): |
| 31 |
if isinstance(s, Atom): |
| 32 |
# This is an efficiency assertion, to ensure that the Atom |
| 33 |
@@ -1087,8 +1087,13 @@ class Atom(_atom_base): |
| 34 |
_atom_base.__init__(s) |
| 35 |
|
| 36 |
atom_re = _get_atom_re(eapi) |
| 37 |
- if eapi_has_repo_deps(eapi): |
| 38 |
- allow_repo = True |
| 39 |
+ |
| 40 |
+ if eapi is not None: |
| 41 |
+ # Ignore allow_repo when eapi is specified. |
| 42 |
+ allow_repo = eapi_has_repo_deps(eapi) |
| 43 |
+ else: |
| 44 |
+ if allow_repo is None: |
| 45 |
+ allow_repo = True |
| 46 |
|
| 47 |
if "!" == s[:1]: |
| 48 |
blocker = self._blocker(forbid_overlap=("!" == s[1:2])) |
Archives