1 |
On Jan 15, 2014 7:08 PM, "Tom Wijsman" <tomwij@g.o> wrote: |
2 |
> |
3 |
> --- |
4 |
> bin/repoman | 2 ++ |
5 |
> man/repoman.1 | 3 +++ |
6 |
> pym/repoman/checks.py | 10 ++++++++++ |
7 |
> 3 files changed, 15 insertions(+) |
8 |
> |
9 |
> diff --git a/bin/repoman b/bin/repoman |
10 |
> index 3263ceb..6754edd 100755 |
11 |
> --- a/bin/repoman |
12 |
> +++ b/bin/repoman |
13 |
> @@ -318,6 +318,7 @@ qahelp = { |
14 |
> "EAPI.incompatible": "Ebuilds that use features that are only |
15 |
available with a different EAPI", |
16 |
> "EAPI.unsupported": "Ebuilds that have an unsupported EAPI |
17 |
version (you must upgrade portage)", |
18 |
> "SLOT.invalid": "Ebuilds that have a missing or invalid SLOT |
19 |
variable value", |
20 |
> + "G2CONF.deprecated": "G2CONF is deprecated, see Gentoo bug |
21 |
#482084 and the GNOME team policies", |
22 |
> "HOMEPAGE.missing": "Ebuilds that have a missing or empty |
23 |
HOMEPAGE variable", |
24 |
> "HOMEPAGE.virtual": "Virtuals that have a non-empty HOMEPAGE |
25 |
variable", |
26 |
> "PDEPEND.suspect": "PDEPEND contains a package that usually only |
27 |
belongs in DEPEND.", |
28 |
> @@ -382,6 +383,7 @@ qawarnings = set(( |
29 |
> "dependency.badtilde", |
30 |
> "DESCRIPTION.toolong", |
31 |
> "EAPI.deprecated", |
32 |
> +"G2CONF.deprecated", |
33 |
> "HOMEPAGE.virtual", |
34 |
> "LICENSE.deprecated", |
35 |
> "LICENSE.virtual", |
36 |
> diff --git a/man/repoman.1 b/man/repoman.1 |
37 |
> index 2bf3765..7ec43d5 100644 |
38 |
> --- a/man/repoman.1 |
39 |
> +++ b/man/repoman.1 |
40 |
> @@ -227,6 +227,9 @@ Syntax error in RESTRICT (usually an extra/missing |
41 |
space/parenthesis) |
42 |
> .B SLOT.invalid |
43 |
> Ebuilds that have a missing or invalid SLOT variable value |
44 |
> .TP |
45 |
> +.B G2CONF.deprecated |
46 |
> +G2CONF is deprecated, see Gentoo bug #482084 and the GNOME team policies |
47 |
> +.TP |
48 |
> .B SRC_URI.mirror |
49 |
> A uri listed in profiles/thirdpartymirrors is found in SRC_URI |
50 |
> .TP |
51 |
> diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py |
52 |
> index 85aa065..c2608b0 100644 |
53 |
> --- a/pym/repoman/checks.py |
54 |
> +++ b/pym/repoman/checks.py |
55 |
> @@ -799,6 +799,16 @@ class PortageInternalVariableAssignment(LineCheck): |
56 |
> e += ' on line: %d' |
57 |
> return e |
58 |
> |
59 |
> +class DeprecateG2CONF(LineCheck): |
60 |
> + repoman_check_name = 'G2CONF.deprecated' |
61 |
> + re = re.compile(r'.*G2CONF.*') |
62 |
> + |
63 |
> + def check(self, num, line): |
64 |
> + """Run the check on line and return error if there is |
65 |
one""" |
66 |
> + m = self.re.match(line) |
67 |
> + if m is not None: |
68 |
> + return ("G2CONF on line %d is deprecated, see |
69 |
Gentoo bug #482084.") |
70 |
Are you missing the line number interpolation here? or %d is supposed to be |
71 |
returned? |
72 |
> + |
73 |
> _base_check_classes = (InheritEclass, LineCheck, PhaseCheck) |
74 |
> _constant_checks = None |
75 |
> |
76 |
> -- |
77 |
> 1.8.5.2 |
78 |
> |
79 |
> |
80 |
Other than that, Looks good to me. |