Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2020-08-02 12:27:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare" Sun Aug 2 12:27:36 2020 rev:117 rq:823017 version:20200727T175347.d95eb35 Changes: -------- --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2020-06-11 14:42:17.436909242 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new.3592/build-compare.changes 2020-08-02 12:27:50.415825207 +0200 @@ -1,0 +2,7 @@ +Mon Jul 27 06:06:06 UTC 2020 - bwiedem...@suse.de + +- Make output more diffable and readable +- Fix regression in compare_archive +- Fix unit tests + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.XJlwkt/_old 2020-08-02 12:27:51.687826514 +0200 +++ /var/tmp/diff_new_pack.XJlwkt/_new 2020-08-02 12:27:51.691826518 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20200529T212652.102d844 +Version: 20200727T175347.d95eb35 Release: 0 Source1: COPYING Source2: same-build-result.sh ++++++ functions.sh ++++++ --- /var/tmp/diff_new_pack.XJlwkt/_old 2020-08-02 12:27:51.743826571 +0200 +++ /var/tmp/diff_new_pack.XJlwkt/_new 2020-08-02 12:27:51.743826571 +0200 @@ -218,7 +218,7 @@ function comp_file() { echo "comparing $1" - if ! diff -au $2 $3; then + if ! diff --label old-$1 --label new-$1 -au $2 $3; then if test -z "$check_all"; then rm $2 $3 $4 $5 return 1 @@ -320,7 +320,7 @@ cat $rpm_meta_old | trim_release_old > $file1 cat $rpm_meta_new | trim_release_new > $file2 echo "comparing the rpm tags of $name_new" - if diff -au $file1 $file2; then + if diff --label old-rpm-tags --label new-rpm-tags -au $file1 $file2; then rm $file1 $file2 $rpm_meta_old $rpm_meta_new return 0 fi @@ -376,7 +376,7 @@ do : "${REPLY}" files+=( "${REPLY}" ) - done < <(diff -U0 $file1 $file2 | sed -E -n -e '/^-\//{s/^-//;s/ [0-9a-f]+ [0-9]+$//;p}') + done < <(diff -U0 $file1 $file2 | sed -E -n -e '/^\+\//{s/^\+//;s/ [0-9a-f]+ [0-9]+$//;p}') fi if test -n "$sh"; then ++++++ pkg-diff.sh ++++++ --- /var/tmp/diff_new_pack.XJlwkt/_old 2020-08-02 12:27:51.755826584 +0200 +++ /var/tmp/diff_new_pack.XJlwkt/_new 2020-08-02 12:27:51.755826584 +0200 @@ -198,6 +198,8 @@ offset=$(( ($offset >> 6) << 6 )) length=512 diff -u \ + --label "old $file (hex)" \ + --label "new $file (hex)" \ <( hexdump -C -s $offset -n $length "old/$file" ) \ <( hexdump -C -s $offset -n $length "new/$file" ) | $buildcompare_head return 1 @@ -789,6 +791,7 @@ : "${REPLY}" filelist+=( "${REPLY}" ) done < 'cn' + ret=0 for f in "${filelist[@]}" do if ! check_single_file "${file}/${f}" @@ -801,7 +804,6 @@ fi watchdog_touch done - ret=$? else wprint "$file has different file list" diff -u 'co' 'cn' @@ -832,7 +834,7 @@ verify_before_processing "${file}" "${dfile}" case "$?" in 0) return 0 ;; - 1) return 1 ;; + 1) test -z "$check_all" && return 1 ;; *) ;; esac @@ -901,6 +903,8 @@ ELF*[LM]SB\ pie\ executable*|\ setuid\ ELF*[LM]SB\ pie\ executable*) diff --speed-large-files --unified \ + --label "old $file (disasm)" \ + --label "new $file (disasm)" \ <( $OBJDUMP -d --no-show-raw-insn old/$file | filter_disasm | sed -e "s,old/,," ; @@ -973,6 +977,8 @@ for section in $sections do diff --unified \ + --label "old $file (objdump)" \ + --label "new $file (objdump)" \ <( $OBJDUMP -s -j $section old/$file | sed -e "s,^old/,," ; echo "${PIPESTATUS[@]}" > $file1) \
