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

[SCM] Debian package checker branch, master, updated. 2.0.0-67-g6e0646e



The following commit has been merged in the master branch:
commit 439ef5eba193fe4a40281fbb7f0066c325b333d7
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Fri Nov 28 15:58:20 2008 +0100

    checks/debhelper: rename $depends to $bdepends to make purpose clearer

diff --git a/checks/debhelper b/checks/debhelper
index 8524a43..4e0917b 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -123,7 +123,7 @@ my $single_pkg = keys(%$pkgs) == 1 ? $pkgs->{(keys(%$pkgs))[0]} : '';
 # If we got this far, they need to have #DEBHELPER# in their scripts.  Search
 # for scripts that look like maintainer scripts.  Also collect dependency
 # information from debian/control and check compatibility level.
-my $depends;
+my $bdepends;
 opendir(DEBIAN, 'debfiles')
     or fail("Can't open debfiles directory.");
 while (defined(my $file=readdir(DEBIAN))) {
@@ -164,14 +164,14 @@ while (defined(my $file=readdir(DEBIAN))) {
 	}
     } elsif ($file =~ m/^control$/) {
         my ($control) = read_dpkg_control("debfiles/$file");
-        $depends = '';
+        $bdepends = '';
         for my $field ('build-depends', 'build-depends-indep') {
             next unless $control->{$field};
-            $depends .= ', ' if $depends;
-            $depends .= $control->{$field};
+            $bdepends .= ', ' if $bdepends;
+            $bdepends .= $control->{$field};
         }
-        $depends = Dep::parse($depends);
-        if ($needbuilddepends && ! Dep::implies($depends, Dep::parse('debhelper'))) {
+        $bdepends = Dep::parse($bdepends);
+        if ($needbuilddepends && ! Dep::implies($bdepends, Dep::parse('debhelper'))) {
 	    tag "package-uses-debhelper-but-lacks-build-depends", "";
 	}
     } elsif ($file =~ m/^ex\.|\.ex$/i) {
@@ -200,13 +200,13 @@ if ($usescdbs and not $needversiondepends) {
 $needversiondepends ||= 1;
 if ($needversiondepends < 4) {
     tag "package-uses-deprecated-debhelper-compat-version", $needversiondepends;
-} elsif ($needversiondepends > 5 and ! Dep::implies($depends, Dep::parse("debhelper (>= $needversiondepends)"))) {
+} elsif ($needversiondepends > 5 and ! Dep::implies($bdepends, Dep::parse("debhelper (>= $needversiondepends)"))) {
     tag "package-lacks-versioned-build-depends-on-debhelper", $needversiondepends;
 } elsif (@versioncheck) {
     for my $program (@versioncheck) {
         my $required = $versions{$program};
         tag 'debhelper-script-needs-versioned-build-depends', $program, "(>= $required)"
-            unless Dep::implies($depends, Dep::parse("debhelper (>= $required)"));
+            unless Dep::implies($bdepends, Dep::parse("debhelper (>= $required)"));
     }
 }
 

-- 
Debian package checker


Reply to: