Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package release-compare for openSUSE:Factory checked in at 2021-02-02 14:25:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/release-compare (Old) and /work/SRC/openSUSE:Factory/.release-compare.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "release-compare" Tue Feb 2 14:25:48 2021 rev:14 rq:868534 version:0.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/release-compare/release-compare.changes 2020-12-03 18:43:38.238229700 +0100 +++ /work/SRC/openSUSE:Factory/.release-compare.new.28504/release-compare.changes 2021-02-02 14:26:03.195427422 +0100 @@ -1,0 +2,25 @@ +Tue Feb 2 08:12:14 UTC 2021 - Adrian Schr??ter <adr...@suse.de> + +- update to version 0.5.2 + * escape backslashes in YAML string + +------------------------------------------------------------------- +Mon Feb 1 13:06:15 UTC 2021 - Adrian Schr??ter <adr...@suse.de> + +- update to version 0.5.1 + * Handle packages info without license tag correctly + * fix potential diff format issue + +------------------------------------------------------------------- +Wed Dec 16 13:08:26 UTC 2020 - Joachim Gleissner <jgleiss...@suse.com> + +- create list of package version changes in YAML output + + +------------------------------------------------------------------- +Thu Dec 10 15:00:48 UTC 2020 - Adrian Schr??ter <adr...@suse.de> + +- update to version 0.5.0 + * exports changes also as YAML file (provided by Joachim Gleissner) + +------------------------------------------------------------------- Old: ---- release-compare-0.4.1.obscpio New: ---- release-compare-0.5.2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ release-compare.spec ++++++ --- /var/tmp/diff_new_pack.CBzFJQ/_old 2021-02-02 14:26:03.787428343 +0100 +++ /var/tmp/diff_new_pack.CBzFJQ/_new 2021-02-02 14:26:03.791428349 +0100 @@ -1,7 +1,7 @@ # # spec file for package release-compare # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ License: GPL-3.0-or-later Group: Development/Tools/Building URL: https://github.com/openSUSE/release-compare -Version: 0.4.1 +Version: 0.5.2 Release: 0 Source: %name-%version.tar.xz BuildArch: noarch ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CBzFJQ/_old 2021-02-02 14:26:03.851428442 +0100 +++ /var/tmp/diff_new_pack.CBzFJQ/_new 2021-02-02 14:26:03.851428442 +0100 @@ -1,14 +1,14 @@ <services> - <service name="obs_scm" mode="disabled"> + <service name="obs_scm" mode="manual"> <param name="url">https://github.com/openSUSE/release-compare.git</param> <param name="scm">git</param> - <param name="version">0.4.1</param> - <param name="revision">0.4.1</param> + <param name="version">0.5.2</param> + <param name="revision">0.5.2</param> <param name="extract">release-compare.spec</param> </service> - <service name="set_version" mode="disabled" /> + <service name="set_version" mode="manual" /> <service name="tar" mode="buildtime" /> <service name="recompress" mode="buildtime"> ++++++ release-compare-0.4.1.obscpio -> release-compare-0.5.2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/release-compare-0.4.1/create_changelog new/release-compare-0.5.2/create_changelog --- old/release-compare-0.4.1/create_changelog 2020-11-10 11:11:16.000000000 +0100 +++ new/release-compare-0.5.2/create_changelog 2021-02-02 09:08:58.000000000 +0100 @@ -29,6 +29,30 @@ eol=$'\n' +diff_to_yaml() +{ + while read line ; do + if [[ ${line/#-/} = $line && ${line/#+/} = $line ]]; then + echo -e -n "$closer" + echo -n " ${line}: \"" + closer="\"\n" + opener="" + else + # supress deletions (should not really exist) + if [[ ${line:0:1} != "-" ]] ; then + line="${line:1}" + line="${line//\\/\\\\/}" + line="${line//\"/\\\"/}" + if [ -n "$line" ]; then + echo -e -n "${opener}${line}" + opener='\\n' + fi + fi + fi + done + echo -n -e "$closer" +} + echo "Running obsgendiff data differ..." # create changelogs based on the packaged rpms @@ -83,7 +107,7 @@ fi if [ -n "$PACKAGES_MODE" ]; then - sed -n -e "s,\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\(obs://[^-]*-[^|]*\)|.*,\6::::\1-\3-\4.\5.rpm," -e "s,^obs://.*/[^-]*-,,p" "$report" + sed -n -e "s,\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\(obs://[^-]*-[^|]*\)|\?.*,\6::::\1-\3-\4.\5.rpm," -e "s,^obs://.*/[^-]*-,,p" "$report" else # product-builder uses single quote, but bs_worker writes it with double quote... sed -n -e "s,.*<binary .*disturl=.\(obs://[^-]*-[^ ]*\). .*>.*/\(.*\)</binary>$,\1::::\2," -e 's,.*/[^-]*-\(.*::::.*\),\1,p' "$report" @@ -131,16 +155,20 @@ # The OBS publisher is publishing all ChangeLog.*.txt files by default. changelog=/.build.packages/OTHER/ChangeLog.${report##*/} changelog=${changelog%.report} + changelog_yaml=${changelog%.packages}.yaml changelog=${changelog%.packages}.txt echo ""> $changelog - + rm -f $changelog_yaml + # removed packages echo "Removed rpms">> $changelog echo "============">> $changelog echo "">> $changelog + echo "removed:" >> $changelog_yaml find "$released/rpms/" -type f | sort | sed "s,^$released/rpms/,," | while read file; do - [ -e "${out}/rpms/$file" ] || echo " - ${file##*::}" >> $changelog + [ -e "${out}/rpms/$file" ] || echo " - ${file##*::}" | tee -a $changelog | \ + sed -e 's/^/ /' >> $changelog_yaml done echo "">> $changelog @@ -148,8 +176,10 @@ echo "Added rpms">> $changelog echo "==========">> $changelog echo "">> $changelog + echo "added:" >> $changelog_yaml find "$out/rpms/" -type f | sort | sed "s,^$out/rpms/,," | while read file; do - [ -e "${released}/rpms/$file" ] || echo " - ${file##*::}" >> $changelog + [ -e "${released}/rpms/$file" ] || echo " - ${file##*::}" | tee -a $changelog | \ + sed -e 's/^/ /' >> $changelog_yaml done echo "">> $changelog @@ -157,13 +187,30 @@ echo "Package Source Changes">> $changelog echo "======================">> $changelog echo "">> $changelog + echo "source-changes:" >> $changelog_yaml # poor mans changelog generation diff -ur "${released}/changelogs/" "$out/changelogs/" \ | grep -v '^Only in ' \ | grep '^[+-]' \ | grep -v '^--- ' \ - | sed -e's,^+++ .*/\([^\t]*\).*$,\1,' -e 's,^::import::.*::,,' \ - >> $changelog + | sed -e's,^+++ .*/\([^\t]*\).*$,\1,' -e 's,^::import::.*::,,' | \ + tee -a $changelog | diff_to_yaml >> $changelog_yaml + + # version changes of binary packages + echo "version-changes:" >> $changelog_yaml + find "$out/rpms/" -type f | sort | sed "s,^$out/rpms/,," | while read file; do + [ -e "${released}/rpms/$file" ] && { echo " ${file##*::}:" ; \ + LC_ALL=C.UTF-8 rpm -q "${file##*::}" --dbpath /.build.packages/KIWIROOT*/var/lib/rpm \ + --queryformat " version: %{VERSION}\n build: %{RELEASE}\n" ; } + done >> $changelog_yaml + + echo "" >> $changelog + echo "References" >> $changelog + echo "==========" >> $changelog + echo "" >> $changelog + echo "references:" >> $changelog_yaml + sed -n -r -e 's/(.*)(CVE-[[:digit:]]{4}-[[:digit:]]{4})(.*)/\2/p' $changelog | \ + sort -u | sed -e 's/^/ - /' | tee -a $changelog | sed -e 's/^/ /' >> $changelog_yaml fi done ++++++ release-compare.obsinfo ++++++ --- /var/tmp/diff_new_pack.CBzFJQ/_old 2021-02-02 14:26:03.967428622 +0100 +++ /var/tmp/diff_new_pack.CBzFJQ/_new 2021-02-02 14:26:03.967428622 +0100 @@ -1,5 +1,5 @@ name: release-compare -version: 0.4.1 -mtime: 1605003076 -commit: 5a51c7f24f30672774e0f1692059ecc7fe820877 +version: 0.5.2 +mtime: 1612253338 +commit: e5f4c00214472a822f26e39b6a53fd480d6a8ba3