From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0215F138247 for ; Thu, 16 Jan 2014 01:23:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F01CBE0B15; Thu, 16 Jan 2014 01:23:28 +0000 (UTC) Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 173D0E0B14 for ; Thu, 16 Jan 2014 01:23:27 +0000 (UTC) Received: by mail-we0-f169.google.com with SMTP id u57so2596885wes.14 for ; Wed, 15 Jan 2014 17:23:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=FyP73nSRjcMX+ofUCn/nXgDErFyu+iQL4/9CQJxR7dw=; b=nLozF9WFDwTCN/K8vUO0LdzQ+ZgqscxxfR+VVEQcTtIzultKldTNaW+tqSkKzWXUl+ J8K5g61ASq/2kD8v2PpjsznvmwmG2xFo4m9N9/dZwEpXhdo6CHPCMJv0mKd+XhP6UbYi BTjmrfKs9/zba90xH+dD+zoBFblTSi93SGH0WfJYLwLzpop3fPGmFLTk/jsrsqgY+F4f yF/nlt/4M2Zn28H7hYwwg7PnUKRifbVxzfST5hklg/htjhVPT9HxEjR4sjjA1iMMx17T LArqBlyekl0aKOviBS47HyThZ40++ABrxKZkSmEgEv01O2dLOhjNt6o0Vnnkt60OpCbN aRBA== Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 X-Received: by 10.180.106.165 with SMTP id gv5mr5257822wib.32.1389835406787; Wed, 15 Jan 2014 17:23:26 -0800 (PST) Sender: neurogeekster@gmail.com Received: by 10.216.83.206 with HTTP; Wed, 15 Jan 2014 17:23:26 -0800 (PST) Received: by 10.216.83.206 with HTTP; Wed, 15 Jan 2014 17:23:26 -0800 (PST) In-Reply-To: <1389830840-25848-4-git-send-email-tomwij@gentoo.org> References: <1389830840-25848-1-git-send-email-tomwij@gentoo.org> <1389830840-25848-4-git-send-email-tomwij@gentoo.org> Date: Wed, 15 Jan 2014 20:23:26 -0500 X-Google-Sender-Auth: PRdVew69OhkHz4cm_BYrmvOJWQM Message-ID: Subject: Re: [gentoo-portage-dev] [PATCH 3/3] Have repoman deprecate G2CONF for the GNOME team. (bug #482084). From: "Jesus Rivero (Neurogeek)" To: gentoo-portage-dev@lists.gentoo.org Content-Type: multipart/alternative; boundary=e89a8f3bad47b7c77404f00c450d X-Archives-Salt: 77af2070-7636-4277-bc25-3cef406cebee X-Archives-Hash: 10909eb364bc1c8eb41b51119b5bc994 --e89a8f3bad47b7c77404f00c450d Content-Type: text/plain; charset=ISO-8859-1 On Jan 15, 2014 7:08 PM, "Tom Wijsman" wrote: > > --- > bin/repoman | 2 ++ > man/repoman.1 | 3 +++ > pym/repoman/checks.py | 10 ++++++++++ > 3 files changed, 15 insertions(+) > > diff --git a/bin/repoman b/bin/repoman > index 3263ceb..6754edd 100755 > --- a/bin/repoman > +++ b/bin/repoman > @@ -318,6 +318,7 @@ qahelp = { > "EAPI.incompatible": "Ebuilds that use features that are only available with a different EAPI", > "EAPI.unsupported": "Ebuilds that have an unsupported EAPI version (you must upgrade portage)", > "SLOT.invalid": "Ebuilds that have a missing or invalid SLOT variable value", > + "G2CONF.deprecated": "G2CONF is deprecated, see Gentoo bug #482084 and the GNOME team policies", > "HOMEPAGE.missing": "Ebuilds that have a missing or empty HOMEPAGE variable", > "HOMEPAGE.virtual": "Virtuals that have a non-empty HOMEPAGE variable", > "PDEPEND.suspect": "PDEPEND contains a package that usually only belongs in DEPEND.", > @@ -382,6 +383,7 @@ qawarnings = set(( > "dependency.badtilde", > "DESCRIPTION.toolong", > "EAPI.deprecated", > +"G2CONF.deprecated", > "HOMEPAGE.virtual", > "LICENSE.deprecated", > "LICENSE.virtual", > diff --git a/man/repoman.1 b/man/repoman.1 > index 2bf3765..7ec43d5 100644 > --- a/man/repoman.1 > +++ b/man/repoman.1 > @@ -227,6 +227,9 @@ Syntax error in RESTRICT (usually an extra/missing space/parenthesis) > .B SLOT.invalid > Ebuilds that have a missing or invalid SLOT variable value > .TP > +.B G2CONF.deprecated > +G2CONF is deprecated, see Gentoo bug #482084 and the GNOME team policies > +.TP > .B SRC_URI.mirror > A uri listed in profiles/thirdpartymirrors is found in SRC_URI > .TP > diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py > index 85aa065..c2608b0 100644 > --- a/pym/repoman/checks.py > +++ b/pym/repoman/checks.py > @@ -799,6 +799,16 @@ class PortageInternalVariableAssignment(LineCheck): > e += ' on line: %d' > return e > > +class DeprecateG2CONF(LineCheck): > + repoman_check_name = 'G2CONF.deprecated' > + re = re.compile(r'.*G2CONF.*') > + > + def check(self, num, line): > + """Run the check on line and return error if there is one""" > + m = self.re.match(line) > + if m is not None: > + return ("G2CONF on line %d is deprecated, see Gentoo bug #482084.") Are you missing the line number interpolation here? or %d is supposed to be returned? > + > _base_check_classes = (InheritEclass, LineCheck, PhaseCheck) > _constant_checks = None > > -- > 1.8.5.2 > > Other than that, Looks good to me. --e89a8f3bad47b7c77404f00c450d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable


On Jan 15, 2014 7:08 PM, "Tom Wijsman" <tomwij@gentoo.org> wrote:
>
> ---
> =A0bin/repoman =A0 =A0 =A0 =A0 =A0 | =A02 ++
> =A0man/repoman.1 =A0 =A0 =A0 =A0 | =A03 +++
> =A0pym/repoman/checks.py | 10 ++++++++++
> =A03 files changed, 15 insertions(+)
>
> diff --git a/bin/repoman b/bin/repoman
> index 3263ceb..6754edd 100755
> --- a/bin/repoman
> +++ b/bin/repoman
> @@ -318,6 +318,7 @@ qahelp =3D {
> =A0 =A0 =A0 =A0 "EAPI.incompatible": "Ebuilds that use = features that are only available with a different EAPI",
> =A0 =A0 =A0 =A0 "EAPI.unsupported": "Ebuilds that have = an unsupported EAPI version (you must upgrade portage)",
> =A0 =A0 =A0 =A0 "SLOT.invalid": "Ebuilds that have a mi= ssing or invalid SLOT variable value",
> + =A0 =A0 =A0 "G2CONF.deprecated": "G2CONF is deprecate= d, see Gentoo bug #482084 and the GNOME team policies",
> =A0 =A0 =A0 =A0 "HOMEPAGE.missing": "Ebuilds that have = a missing or empty HOMEPAGE variable",
> =A0 =A0 =A0 =A0 "HOMEPAGE.virtual": "Virtuals that have= a non-empty HOMEPAGE variable",
> =A0 =A0 =A0 =A0 "PDEPEND.suspect": "PDEPEND contains a = package that usually only belongs in DEPEND.",
> @@ -382,6 +383,7 @@ qawarnings =3D set((
> =A0"dependency.badtilde",
> =A0"DESCRIPTION.toolong",
> =A0"EAPI.deprecated",
> +"G2CONF.deprecated",
> =A0"HOMEPAGE.virtual",
> =A0"LICENSE.deprecated",
> =A0"LICENSE.virtual",
> diff --git a/man/repoman.1 b/man/repoman.1
> index 2bf3765..7ec43d5 100644
> --- a/man/repoman.1
> +++ b/man/repoman.1
> @@ -227,6 +227,9 @@ Syntax error in RESTRICT (usually an extra/missing= space/parenthesis)
> =A0.B SLOT.invalid
> =A0Ebuilds that have a missing or invalid SLOT variable value
> =A0.TP
> +.B G2CONF.deprecated
> +G2CONF is deprecated, see Gentoo bug #482084 and the GNOME team polic= ies
> +.TP
> =A0.B SRC_URI.mirror
> =A0A uri listed in profiles/thirdpartymirrors is found in SRC_URI
> =A0.TP
> diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
> index 85aa065..c2608b0 100644
> --- a/pym/repoman/checks.py
> +++ b/pym/repoman/checks.py
> @@ -799,6 +799,16 @@ class PortageInternalVariableAssignment(LineCheck= ):
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 e +=3D ' on line: = %d'
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return e
>
> +class DeprecateG2CONF(LineCheck):
> + =A0 =A0 =A0 repoman_check_name =3D 'G2CONF.deprecated'
> + =A0 =A0 =A0 re =3D re.compile(r'.*G2CONF.*')
> +
> + =A0 =A0 =A0 def check(self, num, line):
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 """Run the check on line = and return error if there is one"""
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 m =3D self.re.match(line)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if m is not None:
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return ("G2CONF on = line %d is deprecated, see Gentoo bug #482084.")
Are you missing the line number interpolation here? or %d is supposed to be= returned?
> +
> =A0_base_check_classes =3D (InheritEclass, LineCheck, PhaseCheck)
> =A0_constant_checks =3D None
>
> --
> 1.8.5.2
>
>
Other than that, Looks good to me.

--e89a8f3bad47b7c77404f00c450d--