Hello community,
here is the log from the commit of package release-compare for openSUSE:Factory
checked in at 2020-09-09 18:07:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/release-compare (Old)
and /work/SRC/openSUSE:Factory/.release-compare.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "release-compare"
Wed Sep 9 18:07:29 2020 rev:5 rq:833233 version:0.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/release-compare/release-compare.changes
2020-09-03 01:19:05.684579560 +0200
+++
/work/SRC/openSUSE:Factory/.release-compare.new.3399/release-compare.changes
2020-09-09 18:12:08.875755781 +0200
@@ -1,0 +2,15 @@
+Wed Sep 9 11:58:07 UTC 2020 - Adrian Schröter <[email protected]>
+
+- update to version 0.3.4
+ * avoid double Changelog txt suffix
+ * guess file names need to work with -Snapshot file names on factory
+ * work on source rpm name base only
+ * strip "first" lines of changes to hide the email adresses
+
+-------------------------------------------------------------------
+Wed Sep 2 12:59:41 UTC 2020 - Adrian Schröter <[email protected]>
+
+- update to version 0.3.3
+ * beautify diff of import packages
+
+-------------------------------------------------------------------
Old:
----
release-compare-0.3.2.obscpio
New:
----
release-compare-0.3.4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ release-compare.spec ++++++
--- /var/tmp/diff_new_pack.7AT0aS/_old 2020-09-09 18:12:09.407756266 +0200
+++ /var/tmp/diff_new_pack.7AT0aS/_new 2020-09-09 18:12:09.411756270 +0200
@@ -21,7 +21,7 @@
License: GPL-3.0-or-later
Group: Development/Tools/Building
URL: https://github.com/openSUSE/release-compare
-Version: 0.3.2
+Version: 0.3.4
Release: 0
Source: %name-%version.tar.xz
BuildArch: noarch
++++++ _service ++++++
--- /var/tmp/diff_new_pack.7AT0aS/_old 2020-09-09 18:12:09.439756295 +0200
+++ /var/tmp/diff_new_pack.7AT0aS/_new 2020-09-09 18:12:09.439756295 +0200
@@ -3,8 +3,8 @@
<param name="url">https://github.com/openSUSE/release-compare.git</param>
<param name="scm">git</param>
- <param name="version">0.3.2</param>
- <param name="revision">0.3.2</param>
+ <param name="version">0.3.4</param>
+ <param name="revision">0.3.4</param>
<param name="extract">release-compare.spec</param>
</service>
++++++ release-compare-0.3.2.obscpio -> release-compare-0.3.4.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/release-compare-0.3.2/obsgendiff
new/release-compare-0.3.4/obsgendiff
--- old/release-compare-0.3.2/obsgendiff 2020-09-02 12:32:04.000000000
+0200
+++ new/release-compare-0.3.4/obsgendiff 2020-09-09 13:44:20.000000000
+0200
@@ -32,7 +32,7 @@
echo "Running obsgendiff data differ..."
# create changelogs based on the packaged rpms
-mkdir -p $out/{changelogs,disturl}
+mkdir -p $out/changelogs
for report in /.build.packages/OTHER/*.report \
/.build.packages/KIWI/*.packages \
/.build.packages/DOCKER/*.packages; do
@@ -56,6 +56,10 @@
# try to find a matching name and version first
oldobsgendiff=`echo ${oldobsgendiff/-Build*-/-Build*-}`
if [ ! -e "$oldobsgendiff" ]; then
+ # Factory fallback, it gets named to custom -Snapshot file name
+ oldobsgendiff=`echo ${oldobsgendiff/-Build*-/-Snapshot*-}`
+ fi
+ if [ ! -e "$oldobsgendiff" ]; then
# try to guess where the version is in the string, no guarantee
oldobsgendiff=`echo $oldobsgendiff | sed
's,-[0123456789.]*-,-[0123456789\.]*-,'`
oldobsgendiff=`echo $oldobsgendiff`
@@ -69,24 +73,23 @@
fi
# REGEXP gets the DISTURL only
- REGEXP='s,.*<binary .*\(obs://.*\)</binary>,\1,p'
- [ -n "$PACKAGES_MODE" ] && REGEXP='s,.*|\(obs://.*\)|.*,\1,p'
- sed -n -e "$REGEXP" "$report" | while read disturl; do
+ REGEXP='s,.*<binary
.*disturl="obs://[^-]*-\([^"]*\)".*>.*/\(.*\)</binary>$,\1::::\2,p'
+ [ -n "$PACKAGES_MODE" ] &&
REGEXP='s,\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|\([^|]*\)|obs://[^-]*-\([^|]*\)|.*,\6::::\1-\3-\4.\5.rpm,p''
+ sed -n -e "$REGEXP" "$report" | while read line; do
# rpm file name
- rpm="${disturl##*/}"
- # rpm name only (%NAME)
- name="${rpm%-*}"
- name="${name%-*}"
+ rpm="${line##*::::}"
+ # source package name
+ srcname="${line%::::*}"
# only the worker knows where it was downloaded from....
# the disturl may contained a different build repo
file=`echo /.build.packages/SOURCES/repos/*/*/*/$rpm`
file="${file//${eol}*/}" # bash internal "head -n 1" to be faster
- # dump changelog and disturl for each rpm NAME
- LC_ALL=C.UTF-8 rpm -qp "$file" --changelog --nodigest --nosignature
2>/dev/null > $out/changelogs/${name}
- echo "$disturl" > $out/disturl/${name}
+ # dump changelog for into source package name to avoid duplicates
+ # hide "first" lines to hide email adresses
+ LC_ALL=C.UTF-8 rpm -qp "$file" --changelog --nodigest --nosignature
2>/dev/null | sed '/^\* .*@.*/d' > $out/changelogs/${srcname}
done
# create archive
@@ -106,7 +109,7 @@
if [ -d "${released}" ]; then
# The OBS publisher is publishing all ChangeLog.*.txt files by default.
changelog=/.build.packages/OTHER/ChangeLog.${report##*/}
- changelog=${changelog%.report}.txt
+ changelog=${changelog%.report}
changelog=${changelog%.packages}.txt
echo ""> $changelog
@@ -134,7 +137,12 @@
echo "===============">> $changelog
echo "">> $changelog
# poor mans changelog generation
- diff -ur "${released}/changelogs/" "$out/changelogs/" | grep -v '^Only in
' | grep '^[+-]' | grep -v '^--- ' | sed 's,^+++ .*/\([^\t]*\).*$,\1,' >>
$changelog
+ diff -ur "${released}/changelogs/" "$out/changelogs/" \
+ | grep -v '^Only in ' \
+ | grep '^[+-]' \
+ | grep -v '^--- ' \
+ | sed -e's,^+++ .*/\([^\t]*\).*$,\1,' -e 's,^::import::.*::,,' \
+ >> $changelog
fi
done
++++++ release-compare.obsinfo ++++++
--- /var/tmp/diff_new_pack.7AT0aS/_old 2020-09-09 18:12:09.551756397 +0200
+++ /var/tmp/diff_new_pack.7AT0aS/_new 2020-09-09 18:12:09.551756397 +0200
@@ -1,5 +1,5 @@
name: release-compare
-version: 0.3.2
-mtime: 1599042724
-commit: a54249183236764a9caed6f5a37d1919c05bdf3a
+version: 0.3.4
+mtime: 1599651860
+commit: e015e5126c41659cb32e0a6f5b687a04abf7e216
