From 06a0db6e59327a8428bc2274aa7d5e0b06f22075268e1900c643d1520d0c5709 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 23 Sep 2009 15:21:47 +0000 Subject: [PATCH 1/3] Accepting request 20943 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/build-compare via accept of submit request 20943 revision 12. Request was accepted with message: . OBS-URL: https://build.opensuse.org/request/show/20943 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=36 --- build-compare.changes | 5 +++++ same-build-result.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 578b57c..dddd201 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 23 15:17:49 UTC 2009 - aj@suse.de + +- Handle noarch subpackage in sort correctly. + ------------------------------------------------------------------- Tue Aug 25 10:28:17 CEST 2009 - mls@suse.de diff --git a/same-build-result.sh b/same-build-result.sh index 8ed5a53..ce2125d 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -51,7 +51,7 @@ bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 # 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)) +NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit|grep -v -- -64bit|grep -v -- -x86)) rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature ' for opac in ${OLDRPMS[*]}; do From 04cc7b263b800e49b695be83d59cd673583d13a8884eea4e26cd51d119667746 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 23 Sep 2009 15:23:14 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=37 --- build-compare.changes | 5 ----- same-build-result.sh | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index dddd201..578b57c 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 23 15:17:49 UTC 2009 - aj@suse.de - -- Handle noarch subpackage in sort correctly. - ------------------------------------------------------------------- Tue Aug 25 10:28:17 CEST 2009 - mls@suse.de diff --git a/same-build-result.sh b/same-build-result.sh index ce2125d..8ed5a53 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -51,7 +51,7 @@ bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 # 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 --field-separator=/ --key=7|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 From 399dcbbe481b883bdec426d7c12fb7f5c0b9ea56fedb08c57ed12107421f79d7 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 23 Sep 2009 15:23:15 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/build-compare revision 15.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=148c7c594b342016301f47f16fe75506 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- same-build-result.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 578b57c..dddd201 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 23 15:17:49 UTC 2009 - aj@suse.de + +- Handle noarch subpackage in sort correctly. + ------------------------------------------------------------------- Tue Aug 25 10:28:17 CEST 2009 - mls@suse.de diff --git a/build-compare.spec b/build-compare.spec index 281d559..bf3558a 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.08.20 -Release: 1 +Release: 2 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING diff --git a/same-build-result.sh b/same-build-result.sh index 8ed5a53..ce2125d 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -51,7 +51,7 @@ bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 # 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)) +NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit|grep -v -- -64bit|grep -v -- -x86)) rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature ' for opac in ${OLDRPMS[*]}; do