commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-01-20 20:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "build-compare", Maintainer is "coolo@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-01-12 17:12:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-01-20 20:23:05.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 20 08:49:39 UTC 2012 - aj@suse.de + +- Sort rpmlint.log files first since the order is non-deterministic. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ same-build-result.sh ++++++ --- /var/tmp/diff_new_pack.Y5nqXQ/_old 2012-01-20 20:23:06.000000000 +0100 +++ /var/tmp/diff_new_pack.Y5nqXQ/_new 2012-01-20 20:23:06.000000000 +0100 @@ -90,11 +90,16 @@ if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then echo "comparing $OLDDIR/rpmlint.log and $RPMLINTDIR/rpmlint.log" - if ! cmp -s $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log; then + # 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 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 fi + rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted fi if test $SUCCESS -eq 0; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de