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

[SCM] Debian package checker branch, master, updated. 2.1.2-8-g8a44975



The following commit has been merged in the master branch:
commit 8a449756a047cde8410baa0bb39923bcf7973475
Author: Russ Allbery <rra@debian.org>
Date:   Fri Dec 26 23:17:10 2008 -0800

    Skip version substvar checks for dynamic package names
    
    * checks/version-substvars:
      + [RA] Skip version substvar checks when the dependency is on a
        package whose name is formed by expanding substvars at build time.
        Thanks, Bastian Blank.  (Closes: #507763)

diff --git a/checks/version-substvars b/checks/version-substvars
index 9103693..cb3d47d 100644
--- a/checks/version-substvars
+++ b/checks/version-substvars
@@ -68,8 +68,12 @@ foreach (@control_data) {
 		$pkg2 = $1;
 		$substvar_strips_binNMU = ($2 eq 'source:Version');
 
+		# We can't test dependencies on packages whose names are
+		# formed via substvars expanded during the build.  Assume
+		# those maintainers know what they're doing.
 		if (not -f "control/$pkg2/architecture") {
-			tag "version-substvar-for-external-package", "$pkg1 -> $pkg2";
+			tag "version-substvar-for-external-package", "$pkg1 -> $pkg2"
+				unless ($pkg2 =~ /\$\{\S+\}/);
 			next;
 		}
 		$pkg2_is_any = (slurp_entire_file("control/$pkg2/architecture") !~ m/^all$/);
@@ -93,4 +97,8 @@ foreach (@control_data) {
 
 1;
 
+# Local Variables:
+# indent-tabs-mode: t
+# cperl-indent-level: 8
+# End:
 # vim: syntax=perl sw=4 ts=4 noet shiftround
diff --git a/debian/changelog b/debian/changelog
index 4dfb732..2fb12b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,10 @@ lintian (2.1.3) UNRELEASED; urgency=low
       - Detect watch files specifying an upstream version for an older
         changelog entry when the current changelog entry has a newer
         upstream version.
+  * checks/version-substvars:
+    + [RA] Skip version substvar checks when the dependency is on a
+      package whose name is formed by expanding substvars at build time.
+      Thanks, Bastian Blank.  (Closes: #507763)
 
   * data/changelog-file/ubuntu-dists:
     + [RA] New shared list of Ubuntu distributions.

-- 
Debian package checker


Reply to: