Accepting request 298179 from openSUSE:Tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/298179
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=88

build-compare.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Apr 13 08:55:39 UTC 2015 - olaf@aepfle.de
+
+- 2015.04.13
+- 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
 

build-compare.spec

@@ -21,7 +21,7 @@ Summary:        Build Result Compare Script
 License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            https://github.com/openSUSE/build-compare
-Version:        2015.03.20
+Version:        2015.04.13
 Release:        0
 Source1:        COPYING
 Source2:        same-build-result.sh

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,8 +99,16 @@ if [ -n "${NEWRPMS[0]}" ]; then
 fi
 
 # Compare rpmlint.log files
+if test -d /home/abuild/rpmbuild/OTHER; then
   OTHERDIR=/home/abuild/rpmbuild/OTHER
+elif test -d /usr/src/packages/OTHER; then
+  OTHERDIR=/usr/src/packages/OTHER
+else
+  echo "no OTHERDIR"
+  OTHERDIR=
+fi
 
+if test -n "$OTHERDIR"; then
   if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then
     file1=`mktemp`
     file2=`mktemp`
@@ -135,6 +144,7 @@ for xml in $appdatas; do
       SUCCESS=0
     fi
   done
+fi
 
 if test $SUCCESS -eq 0; then
   exit 1