Author: adsb
Date: 2009-03-02 18:05:21 +0000 (Mon, 02 Mar 2009)
New Revision: 1830

Modified:
   trunk/debian/changelog
   trunk/scripts/debdiff.pl
Log:
* debdiff:
  + Don't treat an absence of differences as an error when comparing
    source packages. (Closes: #515683)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2009-03-01 01:50:38 UTC (rev 1829)
+++ trunk/debian/changelog      2009-03-02 18:05:21 UTC (rev 1830)
@@ -1,6 +1,9 @@
 devscripts (2.10.47) UNRELEASED; urgency=low
 
   [ Adam D. Barratt ]
+  * debdiff:
+    + Don't treat an absence of differences as an error when comparing
+      source packages. (Closes: #515683)
   * licensecheck:
     + Document --no-conf.
     + Fix an uninitialised variable warning when --no-conf is used. Thanks.

Modified: trunk/scripts/debdiff.pl
===================================================================
--- trunk/scripts/debdiff.pl    2009-03-01 01:50:38 UTC (rev 1829)
+++ trunk/scripts/debdiff.pl    2009-03-02 18:05:21 UTC (rev 1830)
@@ -577,7 +577,10 @@
 
        # Execute diff and remove the common prefixes $dir1/$dir2, so the patch 
can be used with -p1,
        # as if when interdiff would have been used:
-       system(join(" ", @command)) || fatal "Failed to execute @command!";
+       system(join(" ", @command));
+       if ($? != 0 and $? >> 8 != 1) {
+           fatal "Failed to execute @command!";
+       }
 
        if ($have_diffstat and $show_diffstat) {
            print "diffstat for $sdir1 $sdir2\n\n";



-- 
To unsubscribe, send mail to [email protected].

Reply via email to