[SCM] Git repository for devscripts branch, master, updated. v2.12.2-50-g2afe289

[James McCoy]

The following commit has been merged in the master branch:
commit f9a1a4c468671827d2650161cc33324fe0247a98
Author: Nikolaus Schulz <schulz at macnetix.de>
Date:   Thu Aug 23 21:46:14 2012 +0200

    debdiff: fix regression in exit code (Closes: #686247)
    
    Commit 9cbe605 "debdiff: fix CVE-2012-2012 [...]" broke the exit code of
    debdiff, at it made wdiff_control_files return 1 if wdiff found no
    differences in the control files, which in turn made debdiff exit with an
    exit code of 1.
    
    Signed-off-by: Raphael Geissert <geissert at debian.org>
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 7857836..20a0ced 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -1034,6 +1034,7 @@ sub wdiff_control_files($$$$$)
 		my $msg = ucfirst($cf) . " files$usepkgname: wdiff output";
 		print "\n", $msg, "\n", '-' x length $msg, "\n";
 		print $wdiff;
+		$status = 1;
 	    } else {
 		my @output;
 		@output = split /\n/, $wdiff;
@@ -1041,8 +1042,8 @@ sub wdiff_control_files($$$$$)
 		my $msg = ucfirst($cf) . " files$usepkgname: lines which differ (wdiff format)";
 		print "\n", $msg, "\n", '-' x length $msg, "\n";
 		print join("\n", at output), "\n";
+		$status = 1;
 	    }
-	    $status = 1;
 	}
     }
 

-- 
Git repository for devscripts