lintian: r273 - in trunk: checks debian testset testset/filenames/files
Author: he
Date: 2004-05-13 22:22:10 +0200 (Thu, 13 May 2004)
New Revision: 273
Added:
trunk/testset/filenames/files/.#Maelstrom Sound.1.1.1
Modified:
trunk/checks/cruft
trunk/checks/cruft.desc
trunk/debian/changelog
trunk/testset/tags.filenames
Log:
checks/cruft{,.desc}
+ [HE] New check: source-contains-cvs-conflict-copy, triggered by
.#file.version files. They are created by cvs when it tries to merge
local changes and an update from the repo. (Closes: #246060)
Modified: trunk/checks/cruft
===================================================================
--- trunk/checks/cruft 2004-05-13 20:20:57 UTC (rev 272)
+++ trunk/checks/cruft 2004-05-13 20:22:10 UTC (rev 273)
@@ -86,6 +86,8 @@
tag "svn-commit-file-in-source", "$name";
} elsif ($name =~ m,^(.+/)?\.cvsignore$,) {
tag "cvsignore-file-in-source", "$name";
+ } elsif ($name =~ m,^(.+/)?\.\#(.+?)\.\d+(\.\d+)*$,) {
+ tag "source-contains-cvs-conflict-copy", "$name";
}
if ($name =~ m,^(.+/)?config.(?:cache|log|status)$, and $pkg ne "lintian") {
Modified: trunk/checks/cruft.desc
===================================================================
--- trunk/checks/cruft.desc 2004-05-13 20:20:57 UTC (rev 272)
+++ trunk/checks/cruft.desc 2004-05-13 20:22:10 UTC (rev 273)
@@ -68,3 +68,10 @@
accident, since transient CVS data usually doesn't belong in packages.
Export from CVS rather than use a checkout.
+Tag: source-contains-cvs-conflict-copy
+Type: warning
+Info: Package contains a CVS conflict copy. These are generated by CVS
+ when a conflict was detected while merging local changes with the updates
+ from the source repository. The file name is `.#file.version', where
+ file is the original filename and version the revision your modifications
+ were based on.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-13 20:20:57 UTC (rev 272)
+++ trunk/debian/changelog 2004-05-13 20:22:10 UTC (rev 273)
@@ -22,6 +22,9 @@
* checks/cruft{,.desc}:
+ [JvW] cvsignore-file-in-source is now info, because it happens so often
by upstream, and is only very minor in size
+ + [HE] New check: source-contains-cvs-conflict-copy, triggered by
+ .#file.version files. They are created by cvs when it tries to merge
+ local changes and an update from the repo. (Closes: #246060)
* checks/debhelper:
+ [FL] Avoid Perl warning about undefined values. Noted by JvW.
* checks/fields{,.desc}:
Added: trunk/testset/filenames/files/.#Maelstrom Sound.1.1.1
===================================================================
Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames 2004-05-13 20:20:57 UTC (rev 272)
+++ trunk/testset/tags.filenames 2004-05-13 20:22:10 UTC (rev 273)
@@ -25,6 +25,7 @@
I: filenames source: cvsignore-file-in-source files/.cvsignore
W: filenames source: ancient-standards-version 3.1.1
W: filenames source: source-contains-CVS-dir CVS
+W: filenames source: source-contains-cvs-conflict-copy files/.#Maelstrom Sound.1.1.1
W: filenames source: source-contains-svn-control-dir .svn
W: filenames source: svn-commit-file-in-source files/svn-commit.tmp
W: filenames: bad-permissions-for-ali-file usr/lib/ada/adalib/test.ali
Reply to: