Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2015-03-30 19:09:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare" Changes: -------- --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2015-02-22 17:19:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2015-03-30 19:09:13.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Mar 20 18:58:22 UTC 2015 - o...@aepfle.de + +- 2015.03.20 +- Convert correct png file before comparison +- Avoid name clashes when comparing png files +- Handle filename changes gracefully when comparing unknown filetypes +- Use generic helper to compare png files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 2015.02.10 +Version: 2015.03.20 Release: 0 Source1: COPYING Source2: same-build-result.sh ++++++ functions.sh ++++++ --- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.000000000 +0200 @@ -255,4 +255,4 @@ rm $file1 $file2 return $RES } -# vim: tw=666 ts=2 et +# vim: tw=666 ts=2 shiftwidth=2 et ++++++ pkg-diff.sh ++++++ --- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.000000000 +0200 @@ -154,14 +154,24 @@ diff_two_files() { - if ! cmp -s old/$file new/$file; then - echo "$file differs ($ftype)" - hexdump -C old/$file > $file1 - hexdump -C new/$file > $file2 - diff -u $file1 $file2 | head -n 200 - return 1 + if test ! -e old/$file; then + echo "Missing in old package: $file" + return 1 fi - return 0 + if test ! -e new/$file; then + echo "Missing in new package: $file" + return 1 + fi + + if cmp -s old/$file new/$file; then + return 0 + fi + + echo "$file differs ($ftype)" + hexdump -C old/$file > $file1 + hexdump -C new/$file > $file2 + diff -u $file1 $file2 | head -n 200 + return 1 } trim_man_first_line() @@ -411,19 +421,17 @@ return $? ;; *png) - # Try to remove timestamps, only if convert from ImageMagick is installed + # Try to remove timestamps, only if convert from ImageMagick is installed if [[ $(type -p convert) ]]; then - convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} - convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} - if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then - echo "$file differs ($ftype)" - hexdump -C old/${file/.png/_n.png} > $file1 - hexdump -C new/${file/.png/_n.png} > $file2 - diff -u $file1 $file2 | head -n 20 - return 1 - fi - return 0 - fi + convert old/$file +set date:create +set date:modify old/${file}.$PPID.$$ + convert new/$file +set date:create +set date:modify new/${file}.$PPID.$$ + mv -f old/${file}.$PPID.$$ old/${file} + mv -f new/${file}.$PPID.$$ new/${file} + if ! diff_two_files; then + return 1 + fi + return 0 + fi ;; /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) for f in old/$file new/$file; do @@ -762,4 +770,4 @@ echo "Package content is identical" fi exit $ret -# vim: tw=666 ts=2 et +# vim: tw=666 ts=2 shiftwidth=2 et ++++++ same-build-result.sh ++++++ --- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.000000000 +0200 @@ -141,4 +141,4 @@ fi echo 'compare validated built as identical !' exit 0 -# vim: tw=666 ts=2 et +# vim: tw=666 ts=2 shiftwidth=2 et ++++++ srpm-check.sh ++++++ --- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.000000000 +0200 @@ -97,4 +97,4 @@ rm -rf $dir exit $ret -# vim: tw=666 ts=2 et +# vim: tw=666 ts=2 shiftwidth=2 et
