- Show hint if pkg-diff.sh returns non-zero

- Adjust intending in same-build-result.sh
- Handle /usr/src/packages/OTHER
- Handle "setuid directory"

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=179

build-compare.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 13 08:55:39 UTC 2015 - olaf@aepfle.de
+
+- Show hint if pkg-diff.sh returns non-zero
+- Adjust intending in same-build-result.sh
+- Handle /usr/src/packages/OTHER
+- Handle "setuid directory"
+
 -------------------------------------------------------------------
 Fri Mar 20 18:58:22 UTC 2015 - olaf@aepfle.de
 

pkg-diff.sh

@@ -689,7 +689,7 @@ check_single_file()
          return 1
        fi
        ;;
-     directory|setuid,\ directory|sticky,\ directory)
+     directory|setuid\ directory|setuid,\ directory|sticky,\ directory)
        # tar might package directories - ignore them here
        return 0
        ;;

same-build-result.sh

@@ -86,6 +86,7 @@ for opac in ${OLDRPMS[*]}; do
     *)
       bash $CMPSCRIPT "$opac" "$npac" || SUCCESS=0
       if test $SUCCESS -eq 0 -a -z "$check_all"; then
+        echo "differences between $opac and $npac"
         exit 1
       fi
     ;;
@@ -98,9 +99,17 @@ if [ -n "${NEWRPMS[0]}" ]; then
 fi
 
 # Compare rpmlint.log files
-OTHERDIR=/home/abuild/rpmbuild/OTHER
+if test -d /home/abuild/rpmbuild/OTHER; then
+  OTHERDIR=/home/abuild/rpmbuild/OTHER
+elif test -d /usr/src/packages/OTHER
+  OTHERDIR=/usr/src/packages/OTHER
+else
+  echo "no OTHERDIR"
+  OTHERDIR=
+fi
 
-if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then
+if test -n "$OTHERDIR"; then
+  if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then
     file1=`mktemp`
     file2=`mktemp`
     echo "comparing $OLDDIR/rpmlint.log and $OTHERDIR/rpmlint.log"
@@ -114,13 +123,13 @@ if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then
       SUCCESS=0
     fi
     rm $file1 $file2
-elif test -e $OTHERDIR/rpmlint.log; then
+  elif test -e $OTHERDIR/rpmlint.log; then
     echo "rpmlint.log is new"
     SUCCESS=0
-fi
+  fi
 
-appdatas=`cd $OTHERDIR && find . -name *-appdata.xml`
-for xml in $appdatas; do
+  appdatas=`cd $OTHERDIR && find . -name *-appdata.xml`
+  for xml in $appdatas; do
     # compare appstream data
     if test -e $OLDDIR/$xml -a -e $OTHERDIR/$xml; then
       file1=$OLDDIR/$xml
@@ -134,7 +143,8 @@ for xml in $appdatas; do
       echo "$xml is new"
       SUCCESS=0
     fi
-done
+  done
+fi
 
 if test $SUCCESS -eq 0; then
   exit 1