From 79431e7c5cbd0e589e6e66a0fb8556c20282e1f5365e532fa4e316e6f7e840e3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Feb 2012 14:19:23 +0000 Subject: [PATCH] don't show diff of sorted files OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=119 --- same-build-result.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/same-build-result.sh b/same-build-result.sh index 599e7fe..a1e718b 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -102,8 +102,7 @@ if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then sort -u $OTHERDIR/rpmlint.log|sed -e "s,$release2,@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file2 if ! cmp -s $file1 $file2; then echo "rpmlint.log files differ:" - # File is sorted, so don't give context that will confuse readers - diff -u0 $file1 $file2 |head -n 20 + diff -u $OLDDIR/rpmlint.log $OTHERDIR/rpmlint.log |head -n 20 SUCCESS=0 fi rm $file1 $file2