From f108006ec2ddba6e70749a340cd382d99983aa37 Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Mon, 6 Apr 2009 00:55:08 -0400 Subject: [PATCH] tags.py: Remove warning for missing CVS tags. Remove warning about Maintainer comment being only for TUs and developers. Make Contributor comment only an informational message. These rules are a bit outdated. Signed-off-by: Loui Chang --- Namcap/tags.py | 12 ++---------- namcap.1 | 2 +- tags | 3 --- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Namcap/tags.py b/Namcap/tags.py index b77ee75..ee89104 100644 --- a/Namcap/tags.py +++ b/Namcap/tags.py @@ -23,7 +23,7 @@ class package: def short_name(self): return "tags" def long_name(self): - return "Looks for Maintainer and CVS Id tags" + return "Looks for Maintainer and Contributor comments" def prereq(self): return "" def analyze(self, pkginfo, tar): @@ -36,21 +36,13 @@ class package: contributortag = 1 if re.match("#\s*Maintainer\s*:",i) != None: maintainertag = 1 - if re.match("#\s*\$Id.*\$",i) != None: - idtag = 1 if contributortag != 1: - ret[1].append(("missing-contributor", ())) + ret[2].append(("missing-contributor", ())) if maintainertag != 1: ret[1].append(("missing-maintainer", ())) - else: - ret[2].append(("maintainer-tags-for-tus-devs", ())) - if idtag != 1: - ret[1].append(("missing-cvs-id", ())) - else: - ret[2].append(("cvs-id-for-tus-devs", ())) return ret def type(self): return "pkgbuild" diff --git a/namcap.1 b/namcap.1 index 969ae5a..3f59ebc 100644 --- a/namcap.1 +++ b/namcap.1 @@ -79,7 +79,7 @@ sfurl verifies that a PKGBUILD is downloading from a specific sourceforge mirror symlink points out symlinks that point to $startdir/pkg instead of where the files will actually be installed to .TP .B tags -tags is for package maintainers. It verifies that we have remembered to add a Maintainer tag and a CVS Id tag +tags is for package maintainers. It verifies that we have remembered to add a Maintainer and Contributor comment. .TP .B url url verifies that we have a url variable set in the PKGBUILD diff --git a/tags b/tags index 0b7e484..2859b70 100644 --- a/tags +++ b/tags @@ -47,7 +47,4 @@ specific-sourceforge-mirror :: Attempting to use specific sourceforge mirror, us using-dl-sourceforge :: Attempting to use dl sourceforge domain, use downloads.sourceforge.net instead missing-contributor :: Missing Contributor tag missing-maintainer :: Missing Maintainer tag -missing-cvs-id :: Missing CVS Id tag -maintainer-tags-for-tus-devs :: 'Maintainer tags for TUs and devs only -cvs-id-for-tus-devs :: CVS Id tags for TUs and devs only missing-url :: Missing url -- 1.6.2.2