[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

lintian: r22 - in trunk: checks testset testset/filenames/debian testset/filenames/files



Author: jeroen
Date: 2004-02-09 02:01:54 +0100 (Mon, 09 Feb 2004)
New Revision: 22

Added:
   trunk/testset/filenames/files/.cvsignore
Modified:
   trunk/checks/cruft
   trunk/testset/filenames/debian/rules
   trunk/testset/info_tags.filenames
   trunk/testset/tags.filenames
Log:
Added test for version control files in source, and fix the detection of .svn
and CVS dirs in source packages.


Modified: trunk/checks/cruft
===================================================================
--- trunk/checks/cruft	2004-02-09 00:37:00 UTC (rev 21)
+++ trunk/checks/cruft	2004-02-09 01:01:54 UTC (rev 22)
@@ -59,18 +59,23 @@
 my $dir = readlink "$cwd/unpacked"; # File::Find in Perl 5.8 appears to need it
 
 sub find_cruft {
-    -f or return; # we just need normal files, for now
     (my $name = $File::Find::name) =~ s,^\Q$dir\E/,,;
+    if (-d) {
+	# More or less copied from files, but this time it checks the source
+	if ($name =~ m,^(.+/)?CVS$,) {
+	    print "W: $pkg $type: source-contains-CVS-dir $name\n";
+	} elsif ($name =~ m,^(.+/)?\.svn$,) {
+	    print "W: $pkg $type: source-contains-svn-control-dir $name\n";
+	}
+    }
 
+    -f or return; # we just need normal files, for now
+
     # More or less copied from files, but this time it checks the source
     if ($name =~ m,^(.+/)?svn-commit\.(.+\.)?tmp$,) {
 	print "W: $pkg $type: svn-commit-file-in-source $name\n";
     } elsif ($name =~ m,^(.+/)?\.cvsignore$,) {
 	print "W: $pkg $type: cvsignore-file-in-source $name\n";
-    } elsif ($name =~ m,^(.+/)?CVS$,) {
-	print "W: $pkg $type: source-contains-CVS-dir $name\n";
-    } elsif ($name =~ m,^(.+/)?\.svn$,) {
-	print "W: $pkg $type: source-contains-svn-control-dir $name\n";
     }
 
     if ($name =~ m,^(.+/)?config.(?:cache|log|status)$, and $pkg ne "lintian") {

Modified: trunk/testset/filenames/debian/rules
===================================================================
--- trunk/testset/filenames/debian/rules	2004-02-09 00:37:00 UTC (rev 21)
+++ trunk/testset/filenames/debian/rules	2004-02-09 01:01:54 UTC (rev 22)
@@ -19,6 +19,7 @@
 # MA 02111-1307, USA.
 
 clean:
+	mkdir -p .svn CVS
 
 build:
 

Added: trunk/testset/filenames/files/.cvsignore
===================================================================

Modified: trunk/testset/info_tags.filenames
===================================================================
--- trunk/testset/info_tags.filenames	2004-02-09 00:37:00 UTC (rev 21)
+++ trunk/testset/info_tags.filenames	2004-02-09 01:01:54 UTC (rev 22)
@@ -9,24 +9,47 @@
 N:   Standards-Version control field. However, please remember to update
 N:   this field next time you upload the package.
 N:
+W: filenames source: source-contains-svn-control-dir .svn
+N:
+N:   Source contains a .svn directory. It was most likely installed by
+N:   accident, since Subversion version control directories usually don't
+N:   belong in packages. Export from subversion rather than checkout.
+N:
+W: filenames source: cvsignore-file-in-source files/.cvsignore
+N:
+N:   Package contains a '.cvsignore' file. It may have been installed by
+N:   accident.
+N:
 W: filenames source: svn-commit-file-in-source files/svn-commit.tmp
 N:
 N:   Package source contains a 'svn-commit(.NNN).tmp' file. This file is
 N:   almost certainly a left-over from a failed Subversion commit, and does
 N:   not belong in a Debian package.
 N:
+W: filenames source: source-contains-CVS-dir CVS
+N:
+N:   Package contains a CVS directory. It was most likely installed by
+N:   accident, since transient CVS data usually doesn't belong in packages.
+N:   Export from CVS rather than use a checkout.
+N:
 E: filenames: non-standard-toplevel-dir files/
 N:
 N:   The Filesystem Hierarchy Standard forbids the installation of new
 N:   files or directories in the root directory, in section 3.
 N:
-W: filenames: file-in-unusual-dir files/ .tif
+W: filenames: file-in-unusual-dir files/.cvsignore
 N:
 N:   This file or symbolic link is in a directory where files are not
 N:   normally installed by Debian packages. If this is deliberate, please
 N:   contact lintian-maint@debian.org to make Lintian accept this as a
 N:   usual directory.
 N:
+W: filenames: cvsignore-file-in-package files/.cvsignore
+N:
+N:   Package contains a '.cvsignore' file. It may have been installed by
+N:   accident.
+N:
+W: filenames: file-in-unusual-dir files/ .tif
 W: filenames: file-in-unusual-dir files/".tif
 W: filenames: file-in-unusual-dir files/'\\ 
 W: filenames: file-in-unusual-dir files/svn-commit.tmp

Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames	2004-02-09 00:37:00 UTC (rev 21)
+++ trunk/testset/tags.filenames	2004-02-09 01:01:54 UTC (rev 22)
@@ -1,6 +1,11 @@
 W: filenames source: ancient-standards-version 3.1.1
+W: filenames source: source-contains-svn-control-dir .svn
+W: filenames source: cvsignore-file-in-source files/.cvsignore
 W: filenames source: svn-commit-file-in-source files/svn-commit.tmp
+W: filenames source: source-contains-CVS-dir CVS
 E: filenames: non-standard-toplevel-dir files/
+W: filenames: file-in-unusual-dir files/.cvsignore
+W: filenames: cvsignore-file-in-package files/.cvsignore
 W: filenames: file-in-unusual-dir files/ .tif
 W: filenames: file-in-unusual-dir files/".tif
 W: filenames: file-in-unusual-dir files/'\\ 



Reply to: