| 1 |
commit: 2d9836a0c8bb313fa66581e6cf27fb1a86ada170 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 5 20:26:29 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 5 21:28:26 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d9836a0 |
| 7 |
|
| 8 |
repoman: remove check for addpredict |
| 9 |
|
| 10 |
This function has not been deprecated, and developers generally have a |
| 11 |
good reason for using it. A repoman warning for this is just noise. |
| 12 |
|
| 13 |
No reason was given when this check was added in 2010, and it was requested |
| 14 |
by a developer who has since retired. |
| 15 |
|
| 16 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 17 |
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org> |
| 18 |
|
| 19 |
repoman/cnf/linechecks/linechecks.yaml | 1 - |
| 20 |
repoman/cnf/repository/repository.yaml | 1 - |
| 21 |
repoman/lib/repoman/modules/linechecks/workaround/__init__.py | 6 ------ |
| 22 |
repoman/lib/repoman/modules/linechecks/workaround/workarounds.py | 7 ------- |
| 23 |
4 files changed, 15 deletions(-) |
| 24 |
|
| 25 |
diff --git a/repoman/cnf/linechecks/linechecks.yaml b/repoman/cnf/linechecks/linechecks.yaml |
| 26 |
index 410bcd9c5..2182b467a 100644 |
| 27 |
--- a/repoman/cnf/linechecks/linechecks.yaml |
| 28 |
+++ b/repoman/cnf/linechecks/linechecks.yaml |
| 29 |
@@ -28,7 +28,6 @@ errors: |
| 30 |
PRESERVE_OLD_LIB: 'Ebuild calls deprecated preserve_old_lib' |
| 31 |
BUILT_WITH_USE: 'built_with_use' |
| 32 |
NO_OFFSET_WITH_HELPERS: 'Helper function is used with D, ROOT, ED, EROOT or EPREFIX' |
| 33 |
- SANDBOX_ADDPREDICT: 'Ebuild calls addpredict' |
| 34 |
USEQ_ERROR: 'Ebuild calls deprecated useq function' |
| 35 |
HASQ_ERROR: 'Ebuild calls deprecated hasq function' |
| 36 |
URI_HTTPS: 'Ebuild uses http:// but should use https://' |
| 37 |
|
| 38 |
diff --git a/repoman/cnf/repository/repository.yaml b/repoman/cnf/repository/repository.yaml |
| 39 |
index 935260424..ad00d18c1 100644 |
| 40 |
--- a/repoman/cnf/repository/repository.yaml |
| 41 |
+++ b/repoman/cnf/repository/repository.yaml |
| 42 |
@@ -71,6 +71,5 @@ linechecks_modules: |
| 43 |
uselessdodoc |
| 44 |
whitespace |
| 45 |
blankline |
| 46 |
- addpredict |
| 47 |
noasneeded |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/repoman/lib/repoman/modules/linechecks/workaround/__init__.py b/repoman/lib/repoman/modules/linechecks/workaround/__init__.py |
| 51 |
index 425085a5c..694695015 100644 |
| 52 |
--- a/repoman/lib/repoman/modules/linechecks/workaround/__init__.py |
| 53 |
+++ b/repoman/lib/repoman/modules/linechecks/workaround/__init__.py |
| 54 |
@@ -10,12 +10,6 @@ module_spec = { |
| 55 |
'name': 'do', |
| 56 |
'description': doc, |
| 57 |
'provides':{ |
| 58 |
- 'addpredict-check': { |
| 59 |
- 'name': "addpredict", |
| 60 |
- 'sourcefile': "workarounds", |
| 61 |
- 'class': "SandboxAddpredict", |
| 62 |
- 'description': doc, |
| 63 |
- }, |
| 64 |
'noasneeded-check': { |
| 65 |
'name': "noasneeded", |
| 66 |
'sourcefile': "workarounds", |
| 67 |
|
| 68 |
diff --git a/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py b/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py |
| 69 |
index 37cb54314..768a47e8e 100644 |
| 70 |
--- a/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py |
| 71 |
+++ b/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py |
| 72 |
@@ -9,10 +9,3 @@ class NoAsNeeded(LineCheck): |
| 73 |
repoman_check_name = 'upstream.workaround' |
| 74 |
re = re.compile(r'.*\$\(no-as-needed\)') |
| 75 |
error = 'NO_AS_NEEDED' |
| 76 |
- |
| 77 |
- |
| 78 |
-class SandboxAddpredict(LineCheck): |
| 79 |
- """Check for calls to the addpredict function.""" |
| 80 |
- repoman_check_name = 'upstream.workaround' |
| 81 |
- re = re.compile(r'(^|\s)addpredict\b') |
| 82 |
- error = 'SANDBOX_ADDPREDICT' |
Archives