diff --git a/build-compare.changes b/build-compare.changes index a4146d7..93e0647 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 7 21:05:30 CET 2009 - coolo@suse.de + +- fix handling of -32bit and -64bit + ------------------------------------------------------------------- Sat Feb 7 14:58:48 CET 2009 - coolo@suse.de diff --git a/build-compare.spec b/build-compare.spec index 37eb920..c571fcc 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script Version: 2009.01.27 -Release: 5 +Release: 6 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING @@ -55,6 +55,8 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%_defaultdocdir/%name/ %changelog * Sat Feb 07 2009 coolo@suse.de +- fix handling of -32bit and -64bit +* Sat Feb 07 2009 coolo@suse.de - fix command line order * Fri Feb 06 2009 coolo@suse.de - use --no-show-raw-insn for objdump -d diff --git a/same-build-result.sh b/same-build-result.sh index 626ed68..989a3b8 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -48,8 +48,10 @@ 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)) +# technically we should not all exclude all -32bit but filter for different archs, but it would be better +# if this script ran earlier in the build +OLDRPMS=($(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort|grep -v -- -32bit|grep -v -- -64bit|grep -v -- -x86)) +NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort|grep -v -- -32bit|grep -v -- -64bit|grep -v -- -x86)) rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature ' for opac in ${OLDRPMS[*]}; do