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 2283B138247 for ; Fri, 17 Jan 2014 22:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84EB8E0ABC; Fri, 17 Jan 2014 22:34:14 +0000 (UTC) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6294E0ABA for ; Fri, 17 Jan 2014 22:34:13 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id y10so5120395wgg.10 for ; Fri, 17 Jan 2014 14:34:12 -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=96qneH+iS4KRc7qBZ/xiqTg+V5VA/fjnEUDi7sBEelU=; b=jnix/jxxo0j9LvdOVxJDH3affnlIh0lupWyztExL63w+yEKn3hg1kmBexQMqPsNgbn k05NGDi3sJic1AwlpO4gnWec8a4/+mhozusfLFCuDemcqYZjSpu9DTFViVVrC07r2pVZ ii7kbomJltrvpyJHNEQjvgBUBU0McLyLGWbHDNOpTy+a5mhLBZwy9yNvuJ/5BxJj+OBD g5T2VCW6NMGzN8GVK3Q10OF67stLRLee5a7jn+9BudRIJQakhbwnxFRafTjl7oTpiLgI PaM532vrAXoNg4nMWkFwQyTeUgRQzBXJ8a/rjXaXW43LDALEUTBnfvGX+O0WhYgEZS0Q gbEw== 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.194.104.39 with SMTP id gb7mr4088702wjb.69.1389998052257; Fri, 17 Jan 2014 14:34:12 -0800 (PST) Sender: neurogeekster@gmail.com Received: by 10.216.83.206 with HTTP; Fri, 17 Jan 2014 14:34:12 -0800 (PST) In-Reply-To: <1389994614-7459-1-git-send-email-tomwij@gentoo.org> References: <1389830840-25848-3-git-send-email-tomwij@gentoo.org> <1389994614-7459-1-git-send-email-tomwij@gentoo.org> Date: Fri, 17 Jan 2014 17:34:12 -0500 X-Google-Sender-Auth: uwNGK5LRRM7BIz_7v3dBOXU-ZTY Message-ID: Subject: Re: [gentoo-portage-dev] [PATCH 2/3 v2] Have repoman check that a package directory contains at least one ebuild (bug #245305). From: "Jesus Rivero (Neurogeek)" To: gentoo-portage-dev@lists.gentoo.org Content-Type: multipart/alternative; boundary=089e0102fae824b48904f032245f X-Archives-Salt: 3fd8e317-7141-42a4-918f-908c6da385d1 X-Archives-Hash: b2421b5bff0b42f819d4b67f26165340 --089e0102fae824b48904f032245f Content-Type: text/plain; charset=ISO-8859-1 On Fri, Jan 17, 2014 at 4:36 PM, Tom Wijsman wrote: > --- > bin/repoman | 8 ++++++++ > man/repoman.1 | 3 +++ > 2 files changed, 11 insertions(+) > > diff --git a/bin/repoman b/bin/repoman > index d1542e9..44f3d3d 100755 > --- a/bin/repoman > +++ b/bin/repoman > @@ -326,6 +326,7 @@ qahelp = { > "SRC_URI.mirror": "A uri listed in profiles/thirdpartymirrors is > found in SRC_URI", > "ebuild.syntax": "Error generating cache entry for ebuild; > typically caused by ebuild syntax error or digest verification failure", > "ebuild.output": "A simple sourcing of the ebuild produces output; > this breaks ebuild policy.", > + "ebuild.missing": "A package directory must at least contain one > ebuild or be treecleaned.", > "ebuild.nesteddie": "Placing 'die' inside ( ) prints an error, but > doesn't stop the ebuild.", > "variable.invalidchar": "A variable contains an invalid character > that is not part of the ASCII character set", > "variable.readonly": "Assigning a readonly variable", > @@ -1442,6 +1443,13 @@ for x in effective_scanlist: > can_force = False > continue > > + if not ebuildlist: > + stats["ebuild.missing"] += 1 > + fails["ebuild.missing"].append("%s must at least contain > one " % x + \ > + "ebuild or be treecleaned.") > + can_force = False > + continue > + > # Sort ebuilds in ascending order for the KEYWORDS.dropped check. > ebuildlist = sorted(pkgs.values()) > ebuildlist = [pkg.pf for pkg in ebuildlist] > diff --git a/man/repoman.1 b/man/repoman.1 > index a78f94e..6315ea9 100644 > --- a/man/repoman.1 > +++ b/man/repoman.1 > @@ -301,6 +301,9 @@ Ebuilds that exist but have not been added to cvs > .B ebuild.output > A simple sourcing of the ebuild produces output; this breaks ebuild > policy. > .TP > +.B ebuild.missing > +A package directory must at least contain one ebuild or be treecleaned. > +.TP > .B ebuild.patches > PATCHES variable should be a bash array to ensure white space safety > .TP > -- > 1.8.5.2 > > > Looks fine. -- Jesus Rivero (Neurogeek) Gentoo Developer --089e0102fae824b48904f032245f Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable



On Fri, Jan 17, 2014 at 4:36 PM, Tom Wijsman <= tomwij@gentoo.org> wrote:
---
=A0bin/repoman =A0 | 8 ++++++++
=A0man/repoman.1 | 3 +++
=A02 files changed, 11 insertions(+)

diff --git a/bin/repoman b/bin/repoman
index d1542e9..44f3d3d 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -326,6 +326,7 @@ qahelp =3D {
=A0 =A0 =A0 =A0 "SRC_URI.mirror": "A uri l= isted in profiles/thirdpartymirrors is found in SRC_URI",
=A0 =A0 =A0 =A0 "ebuild.syntax": "Error generating cache ent= ry for ebuild; typically caused by ebuild syntax error or digest verificati= on failure",
=A0 =A0 =A0 =A0 "ebuild.output": "A simple sourcing of the e= build produces output; this breaks ebuild policy.",
+ =A0 =A0 =A0 "ebuild.missing": "A package directory must at= least contain one ebuild or be treecleaned.",
=A0 =A0 =A0 =A0 "ebuild.nesteddie": "Placing 'die' i= nside ( ) prints an error, but doesn't stop the ebuild.",
=A0 =A0 =A0 =A0 "variable.invalidchar": "A variable contains= an invalid character that is not part of the ASCII character set", =A0 =A0 =A0 =A0 "variable.readonly": "Assigning a readonly v= ariable",
@@ -1442,6 +1443,13 @@ for x in effective_scanlist:
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 can_force =3D False
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 continue

+ =A0 =A0 =A0 if not ebuildlist:
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 stats["ebuild.missing&= quot;] +=3D 1
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 fails["ebuild.missing"].append(&quo= t;%s must at least contain one " % x + \
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "ebuild or be treecleane= d.")
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 can_force =3D False
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 continue
+
=A0 =A0 =A0 =A0 # Sort ebuilds in ascending order for the KEYWORDS.dropped = check.
=A0 =A0 =A0 =A0 ebuildlist =3D sorted(pkgs.values())
=A0 =A0 =A0 =A0 ebuildlist =3D [pkg.pf for pkg in ebuildlist]
diff --git a/man/repoman.1 b/man/repoman.1
index a78f94e..6315ea9 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -301,6 +301,9 @@ Ebuilds that exist but have not been added to cvs
=A0.B ebuild.output
=A0A simple sourcing of the ebuild produces output; this breaks ebuild poli= cy.
=A0.TP
+.B ebuild.missing
+A package directory must at least contain one ebuild or be treecleaned. +.TP
=A0.B ebuild.patches
=A0PATCHES variable should be a bash array to ensure white space safety
=A0.TP
--
1.8.5.2



Looks fine.

--
Jesus Rivero (Neurogeek)
Gentoo Developer
--089e0102fae824b48904f032245f--