Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at Fri Feb 6 15:22:33 CET 2009. -------- --- build-compare/build-compare.changes 2009-02-03 13:51:25.000000000 +0100 +++ build-compare/build-compare.changes 2009-02-06 14:29:35.409495000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 5 17:34:29 CET 2009 - coolo@suse.de + +- fix 2 bugs +- don't ignore source rpms - changed sources should output + changed source rpms, no matter if they create the same binaries + (think of changed copyright header in spec files) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.Hp1282/_old 2009-02-06 15:22:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Hp1282/_new 2009-02-06 15:22:09.000000000 +0100 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: Build Result Compare Script Version: 2009.01.27 -Release: 2 +Release: 3 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING @@ -54,6 +54,11 @@ /usr/lib/build %changelog +* Thu Feb 05 2009 coolo@suse.de +- fix 2 bugs +- don't ignore source rpms - changed sources should output + changed source rpms, no matter if they create the same binaries + (think of changed copyright header in spec files) * Tue Jan 27 2009 adrian@suse.de - Create initial package based on the work of Matz and Coolo This package provides script for the main build script to be able ++++++ rpm-check.sh ++++++ --- /var/tmp/diff_new_pack.Hp1282/_old 2009-02-06 15:22:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Hp1282/_new 2009-02-06 15:22:09.000000000 +0100 @@ -193,7 +193,7 @@ sed -i -e "s,new/,," $file2 if ! diff -u $file1 $file2 > $dfile; then echo "$file differs in assembler output" - head -n 2000 $dfile + head -n 200 $dfile ret=1 break fi @@ -213,7 +213,7 @@ *ASCII*|*text*) if ! cmp -s old/$file new/$file; then echo "$file differs ($ftype)" - diff -u old/$file1 new/$file2 | head -n 200 + diff -u old/$file new/$file | head -n 200 ret=1 break fi ++++++ same-build-result.sh ++++++ --- /var/tmp/diff_new_pack.Hp1282/_old 2009-02-06 15:22:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Hp1282/_new 2009-02-06 15:22:09.000000000 +0100 @@ -26,16 +26,42 @@ exit 1 fi -#OLDRPMS=($(find "$OLDDIR" -name \*src.rpm|sort) $(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort)) -#NEWRPMS=($(find $NEWDIRS -name \*src.rpm|sort) $(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort)) -# Exclude src rpms for now: +if test `find $NEWDIRS -name *.rpm | wc -l` != `find $OLDDIR -name *.rpm | wc -l`; then + echo "different number of subpackages" + find $OLDDIR $NEWDIRS -name *.rpm + exit 1 +fi + +osrpm=$(find "$OLDDIR" -name \*src.rpm) +nsrpm=$(find $NEWDIRS -name \*src.rpm) + +if test ! -f "$osrpm"; then + echo no old source rpm in $OLDDIR + exit 1 +fi + +if test ! -f "$nsrpm"; then + echo no new source rpm in $NEWDIRS + exit 1 +fi + +echo "compare $osrpm $nsrpm" +bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 + OLDRPMS=($(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort)) NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort)) -for opac in "$OLDRPMS"; do +rpmqp="rpm -qp --qf --nodigest --nosignature %{NAME}" +for opac in ${OLDRPMS[*]}; do npac=${NEWRPMS[0]} NEWRPMS=(${NEWRPMS[@]:1}) # shift echo compare "$opac" "$npac" + oname=`$rpmqp $opac` + nname=`$rpmqp $npac` + if test "$oname" != "$nname"; then + echo "names differ: $oname $nname" + exit 1 + fi bash $CMPSCRIPT "$opac" "$npac" || exit 1 done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org