rpm/build-compare
SHA256
1
0
Fork 0
forked from pool/build-compare
Code Pull Requests Activity

Accepting request 100865 from openSUSE:Tools

Browse Source 
Sort rpmlint.log files first. (forwarded request 100864 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/100865
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=62
This commit is contained in:
Stephan Kulow 2012-01-20 19:23:04 +00:00 committed by Git OBS Bridge
commit 74b88ebf37
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-compare.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 20 08:49:39 UTC 2012 - aj@suse.de
- Sort rpmlint.log files first since the order is non-deterministic.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 12 12:59:31 UTC 2012 - aj@suse.de Thu Jan 12 12:59:31 UTC 2012 - aj@suse.de

7
same-build-result.sh
View File

@ -90,11 +90,16 @@ RPMLINTDIR=/home/abuild/rpmbuild/OTHER
if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then
echo "comparing $OLDDIR/rpmlint.log and $RPMLINTDIR/rpmlint.log" 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:" echo "rpmlint.log files differ:"
diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20 diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20
rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
exit 1 exit 1
fi fi
rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
fi fi
if test $SUCCESS -eq 0; then if test $SUCCESS -eq 0; then