[SCM] Debian package checker branch, master, updated. 8c9b0a31683982003af818bd02ff8776aa6a97ae
The following commit has been merged in the master branch:
commit 8c9b0a31683982003af818bd02ff8776aa6a97ae
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Mon Jul 7 23:16:18 2008 +0100
Treat 00list* as dpatch series files, not just 00list
+ [ADB] Treat 00list* as dpatch series files rather than just 00list.
(Closes: #482040). Also rename dpatch-index-references-non-existant-patch
to dpatch-index-references-non-existent-patch.
diff --git a/checks/patch-systems b/checks/patch-systems
index 3e33553..511a15d 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -78,28 +78,30 @@ sub run {
}
close(OPTS);
}
- if (open(IN, '<', "debfiles/patches/00list")) {
+ foreach my $listfile (glob("debfiles/patches/00list*")) {
my @patches;
- while(<IN>) {
- chomp;
- next if (/^\#/); #ignore comments or CPP directive
- s%//.*%% if $list_uses_cpp; # remove C++ style comments
- if ($list_uses_cpp && m%/\*%) {
- # remove C style comments
- $_ .= <IN> while($_ !~ m%\*/%);
- s%/\*[^*]*\*/%%g;
+ if (open(IN, '<', "$listfile")) {
+ while(<IN>) {
+ chomp;
+ next if (/^\#/); #ignore comments or CPP directive
+ s%//.*%% if $list_uses_cpp; # remove C++ style comments
+ if ($list_uses_cpp && m%/\*%) {
+ # remove C style comments
+ $_ .= <IN> while($_ !~ m%\*/%);
+ s%/\*[^*]*\*/%%g;
+ }
+ next if (/^\s*$/); #ignore blank lines
+ push @patches, split(' ', $_);
}
- next if (/^\s*$/); #ignore blank lines
- push @patches, split(' ', $_);
+ close(IN);
}
- close(IN);
# Check each patch.
foreach my $patch_file (@patches) {
$patch_file .= ".dpatch" if -e "debfiles/patches/$patch_file.dpatch"
and not -e "debfiles/patches/$patch_file";
if (! -r "debfiles/patches/$patch_file") {
- tag "dpatch-index-references-non-existant-patch", $patch_file;
+ tag "dpatch-index-references-non-existent-patch", $patch_file;
next;
}
if (open(PATCH_FILE, '<', "debfiles/patches/$patch_file")) {
@@ -151,7 +153,7 @@ sub run {
# Check each patch.
foreach my $patch_file (@patches) {
if (! -r "debfiles/patches/$patch_file") {
- tag "quilt-series-references-non-existant-patch", $patch_file;
+ tag "quilt-series-references-non-existent-patch", $patch_file;
next;
}
check_patch($patch_file);
diff --git a/checks/patch-systems.desc b/checks/patch-systems.desc
index 367e899..25a9e80 100644
--- a/checks/patch-systems.desc
+++ b/checks/patch-systems.desc
@@ -15,11 +15,10 @@ Info: Using dpatch requires you to explicitly list all patches you want
You should either remove the dpatch build dependency or add a patch
list.
-Tag: dpatch-index-references-non-existant-patch
+Tag: dpatch-index-references-non-existent-patch
Type: error
Info: In the 00list file listing all your dpatches, you referenced a file
- that is not existant. This will lead to a fatal error when calling
- dpatch.
+ that does not exist. This will lead to a fatal error when calling dpatch.
Tag: dpatch-missing-description
Type: warning
@@ -60,11 +59,10 @@ Info: The quilt series file contains non-standard options to apply some of
apply with "-p1". This can be done by refreshing all patches like this:
quilt pop -a; while quilt push; do quilt refresh -pab; done
-Tag: quilt-series-references-non-existant-patch
+Tag: quilt-series-references-non-existent-patch
Type: error
Info: In the series file listing all your quilt patches, you referenced a
- file that is not existant. This will lead to a fatal error when calling
- quilt.
+ file that does not exist. This will lead to a fatal error when calling quilt.
Tag: patch-modifying-debian-files
Type: error
diff --git a/debian/changelog b/debian/changelog
index 3cd21e7..dc894ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ lintian (1.24.2) unstable; urgency=low
quilt patches when using the 3.0 (quilt) package format. Fix build
dependency checking and check all dpatch files. Patch from Raphaël
Hertzog. (Closes: #484549)
+ + [ADB] Treat 00list* as dpatch series files rather than just 00list.
+ (Closes: #482040). Also rename dpatch-index-references-non-existant-patch
+ to dpatch-index-references-non-existent-patch.
* checks/rules{,.desc}:
+ [RA] Warn about use of DEB_BUILD_OPTS. Patch from Raphael Geissert.
* checks/scripts:
diff --git a/testset/scripts/debian/patches/00list.sparc b/testset/scripts/debian/patches/00list.sparc
new file mode 100644
index 0000000..8b47ab3
--- /dev/null
+++ b/testset/scripts/debian/patches/00list.sparc
@@ -0,0 +1 @@
+01_some_other_patch_thats_not_in_the_package.dpatch
diff --git a/testset/tags.scripts b/testset/tags.scripts
index bbe95cf..99e9c7b 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -1,4 +1,5 @@
-E: scripts source: dpatch-index-references-non-existant-patch 01_not_here_right_now.dpatch
+E: scripts source: dpatch-index-references-non-existent-patch 01_not_here_right_now.dpatch
+E: scripts source: dpatch-index-references-non-existent-patch 01_some_other_patch_thats_not_in_the_package.dpatch
E: scripts source: package-uses-debhelper-but-lacks-build-depends
E: scripts: calls-suidperl-directly ./usr/bin/suidperlfoo
E: scripts: copyright-file-lacks-pointer-to-perl-license
--
Debian package checker
Reply to: