Author: adsb
Date: 2009-04-11 08:37:02 +0000 (Sat, 11 Apr 2009)
New Revision: 1850

Modified:
   trunk/scripts/nmudiff.sh
Log:
Properly fix the check for debdiff's exit status to handle the fact that 
nmudiff is set -e

Modified: trunk/scripts/nmudiff.sh
===================================================================
--- trunk/scripts/nmudiff.sh    2009-04-10 18:07:42 UTC (rev 1849)
+++ trunk/scripts/nmudiff.sh    2009-04-11 08:37:02 UTC (rev 1850)
@@ -295,10 +295,11 @@
     exit 1
 fi
 
+ret=0
 debdiff ../${SOURCE}_${OLDVERSION_NO_EPOCH}.dsc \
   ../${SOURCE}_${VERSION_NO_EPOCH}.dsc \
-  > ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff
-if [ $? -ne 0 ] && [ $? -ne 1 ]; then
+  > ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff || ret=$?
+if [ $ret -ne 0 ] && [ $ret -ne 1 ]; then
     echo "nmudiff: debdiff failed, aborting." >&2
     rm -f ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff
     exit 1



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

Reply via email to