Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2012-01-27 15:16:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare", Maintainer is "co...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2012-01-20 20:23:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2012-01-27 15:17:00.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 26 10:01:55 UTC 2012 - a...@suse.de
+
+- Remove release from rpmlint.log before comparing.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-compare.spec ++++++
--- /var/tmp/diff_new_pack.hocAB5/_old 2012-01-27 15:17:02.000000000 +0100
+++ /var/tmp/diff_new_pack.hocAB5/_new 2012-01-27 15:17:02.000000000 +0100
@@ -21,7 +21,7 @@
License: GPL-2.0+
Group: Development/Tools/Building
Summary: Build Result Compare Script
-Version: 2012.01.09
+Version: 2012.01.26
Release: 6
Source1: COPYING
Source2: same-build-result.sh
++++++ same-build-result.sh ++++++
--- /var/tmp/diff_new_pack.hocAB5/_old 2012-01-27 15:17:02.000000000 +0100
+++ /var/tmp/diff_new_pack.hocAB5/_new 2012-01-27 15:17:02.000000000 +0100
@@ -62,6 +62,10 @@
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'))
+# Get release from first RPM and keep for rpmlint check
+release1=`rpm -qp --nodigest --nosignature --qf "%{RELEASE}" "${OLDRPMS[1]}"`
+release2=`rpm -qp --nodigest --nosignature --qf "%{RELEASE}" "${NEWRPMS[1]}"`
+
SUCCESS=1
rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature '
for opac in ${OLDRPMS[*]}; do
@@ -89,17 +93,19 @@
RPMLINTDIR=/home/abuild/rpmbuild/OTHER
if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then
+ file1=`mktemp`
+ file2=`mktemp`
echo "comparing $OLDDIR/rpmlint.log and $RPMLINTDIR/rpmlint.log"
# Sort the files first since the order of messages is not deterministic
- sort -u $OLDDIR/rpmlint.log > $OLDDIR/rpmlint.log.sorted
- sort -u $RPMLINTDIR/rpmlint.log > $RPMLINTDIR/rpmlint.log.sorted
- if ! cmp -s $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted; then
+ # Remove release from files
+ sort -u $OLDDIR/rpmlint.log|sed -e "s,$release1, @RELEASE@," > $file1
+ sort -u $RPMLINTDIR/rpmlint.log|sed -e "s,$release2, @RELEASE@," > $file2
+ if ! cmp -s $file1 $file2; then
echo "rpmlint.log files differ:"
diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20
- rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
- exit 1
+ SUCCESS=0
fi
- rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
+ rm $file1 $file2
fi
if test $SUCCESS -eq 0; then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
