| 1 |
commit: 10f6c6d3c028a509ed943ef76633c72dbbcff7f6 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 31 22:22:02 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 22:22:02 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=10f6c6d3 |
| 7 |
|
| 8 |
repoman: disallow EMERGE_FROM in EAPI 4 |
| 9 |
|
| 10 |
We already have the Eapi4GoneVars check for AA and KV which were |
| 11 |
removed in EAPI 4, so we can re-use it to disallow EMERGE_FROM. |
| 12 |
This will fix bug #368865. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/repoman/checks.py | 5 +++-- |
| 16 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py |
| 19 |
index bc25cd5..c9ada5f 100644 |
| 20 |
--- a/pym/repoman/checks.py |
| 21 |
+++ b/pym/repoman/checks.py |
| 22 |
@@ -619,10 +619,11 @@ class Eapi4IncompatibleFuncs(LineCheck): |
| 23 |
class Eapi4GoneVars(LineCheck): |
| 24 |
repoman_check_name = 'EAPI.incompatible' |
| 25 |
ignore_line = re.compile(r'(^\s*#)') |
| 26 |
- undefined_vars_re = re.compile(r'.*\$(\{(AA|KV)\}|(AA|KV))') |
| 27 |
+ undefined_vars_re = re.compile(r'.*\$(\{(AA|KV|EMERGE_FROM)\}|(AA|KV|EMERGE_FROM))') |
| 28 |
|
| 29 |
def check_eapi(self, eapi): |
| 30 |
- return not eapi_exports_AA(eapi) or not eapi_exports_KV(eapi) |
| 31 |
+ # AA, KV, and EMERGE_FROM should not be referenced in EAPI 4 or later. |
| 32 |
+ return not eapi_exports_AA(eapi) |
| 33 |
|
| 34 |
def check(self, num, line): |
| 35 |
m = self.undefined_vars_re.match(line) |
Archives