Revert "save rpmlint output for easier processing by external tools"
authorAdrian Schröter <adrian@suse.de>
Thu, 15 Apr 2010 13:57:42 +0000 (15:57 +0200)
committerAdrian Schröter <adrian@suse.de>
Thu, 15 Apr 2010 13:57:42 +0000 (15:57 +0200)
in agreement with Ludwig.

rpmlint.log and similar files should get exported as QA results
later, but they should not appear as build results to avoid
manualy sorting of files in lots of other places

This reverts commit e3f165caa543e85bd246b195cf2c7c230a96993f.

Conflicts:

build

build

diff --git a/build b/build
index d492eb8..d6bb919 100755 (executable)
--- a/build
+++ b/build
@@ -1837,8 +1837,6 @@ if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/lib/build/checks" ; then
     done
 fi
 
-rpmlintlog="$BUILD_ROOT/$TOPDIR/rpmlint.log"
-rm -f "$rpmlintlog"
 if test -n "$RPMS" -a "$DO_CHECKS" != "false" -a -x "$BUILD_ROOT/opt/testing/bin/rpmlint" -a -d "$BUILD_ROOT/$TOPDIR/RPMS" ; then
     LINT_RPM_FILE_LIST=($(find $BUILD_ROOT/$TOPDIR/RPMS \
        \( -name "*-debuginfo-*" -o -name "*-debugsource-*" \
@@ -1849,12 +1847,7 @@ if test -n "$RPMS" -a "$DO_CHECKS" != "false" -a -x "$BUILD_ROOT/opt/testing/bin
     echo
     echo "RPMLINT report:"
     echo "==============="
-    rpmlint_failed=
-    chroot $BUILD_ROOT /opt/testing/bin/rpmlint \
-           --info ${LINT_RPM_FILE_LIST[*]#$BUILD_ROOT} ${SRPM_FILE_LIST[*]#$BUILD_ROOT} \
-           > "$rpmlintlog" 2>&1 || rpmlint_failed=1
-    cat "$rpmlintlog"
-    test -z "$rpmlint_failed" || cleanup_and_exit 1
+    chroot $BUILD_ROOT /opt/testing/bin/rpmlint --info ${LINT_RPM_FILE_LIST[*]#$BUILD_ROOT} ${SRPM_FILE_LIST[*]#$BUILD_ROOT} || cleanup_and_exit 1
 fi
 
 if test \( -n "$RPMS" -o -n "$DEBS" \) -a -n "$CREATE_BASELIBS" -a \( -d "$BUILD_ROOT/$TOPDIR/RPMS" -o -d "$BUILD_ROOT/$TOPDIR/DEBS" \)  ; then
@@ -1877,7 +1870,7 @@ if test -n "$RUNNING_IN_VM" -a -n "$VM_SWAP"; then
     args="--padstart 512 --padend 512 -v"
     case "$BUILDTYPE" in
        spec)
-           computeblocklists $args $TOPDIR/RPMS/*/*.rpm $TOPDIR/SRPMS/* $TOPDIR/rpmlint.log > "$VM_SWAP"
+           computeblocklists $args $TOPDIR/RPMS/*/*.rpm $TOPDIR/SRPMS/* > "$VM_SWAP"
            ;;
        dsc)
            computeblocklists $args $TOPDIR/DEBS/*.deb $TOPDIR/SOURCES.DEB/* > "$VM_SWAP"