Gentoo Archives: gentoo-portage-dev

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

Replies