diff --git a/build-compare.changes b/build-compare.changes index 8078b4c..4300c1f 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 22 11:07:53 UTC 2012 - coolo@suse.com + +- I changed my mind, appdata.xml is too hard to get right. So + we need to support variable binary names for the appdata + ------------------------------------------------------------------- Sat Feb 18 18:27:40 UTC 2012 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index e388fcf..c10f693 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -16,7 +16,6 @@ # - Name: build-compare Summary: Build Result Compare Script License: GPL-2.0+ diff --git a/same-build-result.sh b/same-build-result.sh index cfc6c1a..2fcaf89 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -112,19 +112,22 @@ elif test -e $OTHERDIR/rpmlint.log; then SUCCESS=0 fi -# compare appstream data -if test -e $OLDDIR/appdata.xml -a -e $OTHERDIR/appdata.xml; then - file1=$OLDDIR/appdata.xml - file2=$OTHERDIR/appdata.xml - if ! cmp -s $file1 $file2; then - echo "appdata.xml files differ:" - diff -u0 $file1 $file2 |head -n 20 +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 + file2=$OTHERDIR/$xml + if ! cmp -s $file1 $file2; then + echo "$xml files differ:" + diff -u0 $file1 $file2 |head -n 20 + SUCCESS=0 + fi + elif test -e $OTHERDIR/$xml; then + echo "$xml is new" SUCCESS=0 fi -elif test -e $OTHERDIR/appdata.xml; then - echo "appdata.xml is new" - SUCCESS=0 -fi +done if test $SUCCESS -eq 0; then exit 1