From: Guillem Jover <guillem@debian.org>
Date: Mon, 24 Sep 2007 20:05:36 +0000 (+0300)
Subject: dpkg-buildpackage: Rename warnable_errors to warnable_error in
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbd396dee5eeb873d67d6fffee9e5701d0ff075;p=dpkg

dpkg-buildpackage: Rename warnable_errors to warnable_error in

Fix the name to the correct variable name exported from controllib.pl.
---

diff --git a/ChangeLog b/ChangeLog
index 0362a3ef..900490a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-24  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-buildpackage.pl ($warnable_errors): Rename to ...
+	($warnable_error): ... this, and declare as 'our'.
+
 2007-09-23  Frank Lichtenheld  <djpig@debian.org>
 
 	* scripts/dpkg-buildpackage.pl: Add new option
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
old mode 100644
new mode 100755
index f4124926..40154c6d
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -13,6 +13,8 @@ use Dpkg::BuildOptions;
 push (@INC, $dpkglibdir);
 require 'controllib.pl';
 
+our $warnable_error;
+
 textdomain("dpkg-dev");
 
 sub showversion {
@@ -95,7 +97,7 @@ if ( ( ($ENV{GNUPGHOME} && -e $ENV{GNUPGHOME})
 }
 
 my ($admindir, $signkey, $forcesigninterface, $usepause, $noclean,
-    $warnable_errors, $sourcestyle, $cleansource,
+    $sourcestyle, $cleansource,
     $binaryonly, $sourceonly, $since, $maint,
     $changedby, $desc, $parallel);
 my (@checkbuilddep_args, @passopts, @tarignore);
@@ -187,10 +189,10 @@ while (@ARGV) {
     } elsif (/^-C(.*)$/) {
 	$desc = $1;
     } elsif (/^-W$/) {
-	$warnable_errors = 1;
+	$warnable_error = 1;
 	push @passopts, '-W';
     } elsif (/^-E$/) {
-	$warnable_errors = 0;
+	$warnable_error = 0;
 	push @passopts, '-E';
     } else {
 	usageerr(sprintf(_g("unknown option or argument %s"), $_));