From 91be221a3d42e51b912d01a1cb9bc1f7f4545f27daa76936326672601414530f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 24 May 2012 10:19:26 +0000 Subject: [PATCH] Accepting request 122045 from home:a_jaeger:branches:build-compare-test Only handle files. OBS-URL: https://build.opensuse.org/request/show/122045 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=136 --- build-compare.changes | 6 ++++++ same-build-result.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 631a249..e605d7f 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 24 10:17:15 UTC 2012 - aj@suse.de + +- Only handle files, not directories when searching for packages. + Patch by Matthieu Tanguay-Carel . + ------------------------------------------------------------------- Tue May 8 12:35:21 UTC 2012 - aj@suse.de diff --git a/same-build-result.sh b/same-build-result.sh index 2fcaf89..fe185e9 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -59,8 +59,8 @@ bash $SCMPSCRIPT "$osrpm" "$nsrpm" || exit 1 # problem: a package can contain both noarch and arch subpackages, so we have to # take care of proper sorting of NEWRPMS, e.g. noarch/x.rpm and x86_64/w.rpm since OLDRPMS # has all the packages in a single directory and would sort this as w.rpm, x.rpm. -OLDRPMS=($(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) -NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) +OLDRPMS=($(find "$OLDDIR" -type f -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) +NEWRPMS=($(find $NEWDIRS -type f -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) # Get release from first RPM and keep for rpmlint check # Remember to quote the "." for future regexes