also cat the rpmlint.log if rpmlint failed

e9925248 · Dec 12, 2011 · 13e3b24 · 13e3b24
1 parent 9e0cd77
commit 13e3b24
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/build b/build
@@ -2072,11 +2072,15 @@ if test -n "$RPMS" -a "$DO_CHECKS" != "false" -a -x "$BUILD_ROOT/opt/testing/bin
     echo "==============="
     rpmlint_logfile=$TOPDIR/OTHER/rpmlint.log
     rm -f "$BUILD_ROOT$rpmlint_logfile"
+    ret=0
     chroot $BUILD_ROOT su -s /opt/testing/bin/rpmlint "$BUILD_USER" -- \
 	    --info ${LINT_RPM_FILE_LIST[*]#$BUILD_ROOT} \
-	    ${SRPM_FILE_LIST[*]#$BUILD_ROOT} > "$BUILD_ROOT$rpmlint_logfile" || cleanup_and_exit 1
+	    ${SRPM_FILE_LIST[*]#$BUILD_ROOT} > "$BUILD_ROOT$rpmlint_logfile" || ret=1
 	    cat "$BUILD_ROOT$rpmlint_logfile"
 	    echo
+    if test "$ret" = 1; then
+	cleanup_and_exit 1
+    fi
 fi
 
 if test \( -n "$RPMS" -o -n "$DEBS" \) -a -n "$CREATE_BASELIBS"; then