Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2023-08-04 15:04:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.22712 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Fri Aug 4 15:04:37 2023 rev:492 rq:1102321 version:20230804.9200c9e
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2023-08-02 16:51:11.285769076 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.22712/openSUSE-release-tools.changes
2023-08-04 15:04:50.876813332 +0200
@@ -1,0 +2,6 @@
+Fri Aug 04 09:13:35 UTC 2023 - opensuse-releaset...@opensuse.org
+
+- Update to version 20230804.9200c9e:
+ * factory-package-news: support newer python3 rpm bindings
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20230801.82c067d.obscpio
New:
----
openSUSE-release-tools-20230804.9200c9e.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.zod51S/_old 2023-08-04 15:04:51.672818294 +0200
+++ /var/tmp/diff_new_pack.zod51S/_new 2023-08-04 15:04:51.680818344 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20230801.82c067d
+Version: 20230804.9200c9e
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.zod51S/_old 2023-08-04 15:04:51.728818643 +0200
+++ /var/tmp/diff_new_pack.zod51S/_new 2023-08-04 15:04:51.732818668 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">82c067dc2c5e8ccdf473d82d687bdfff09f8be3e</param>
+ <param
name="changesrevision">9200c9e707b6bb35086a9af6802c3d1b71892ef6</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20230801.82c067d.obscpio ->
openSUSE-release-tools-20230804.9200c9e.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20230801.82c067d/factory-package-news/factory-package-news.py
new/openSUSE-release-tools-20230804.9200c9e/factory-package-news/factory-package-news.py
---
old/openSUSE-release-tools-20230801.82c067d/factory-package-news/factory-package-news.py
2023-08-01 15:46:18.000000000 +0200
+++
new/openSUSE-release-tools-20230804.9200c9e/factory-package-news/factory-package-news.py
2023-08-04 11:12:28.000000000 +0200
@@ -18,6 +18,15 @@
changelog_max_lines = 100 # maximum number of changelog lines per package
+# rpm's python bindings changed in version 4.15 [0] so that they actually
return
+# utf-8 strings. Leap 15 ships an older version, so this is needed to
+# keep this script working there too.
+#
+# [0]
https://github.com/rpm-software-management/rpm/commit/84920f898315d09a57a3f1067433eaeb7de5e830
+def forcestr(content):
+ return str(content, 'utf-8') if isinstance(content, bytes) else content
+
+
class ChangeLogger(cmdln.Cmdln):
def __init__(self, *args, **kwargs):
cmdln.Cmdln.__init__(self, args, kwargs)
@@ -51,12 +60,12 @@
changelogs = dict()
def _getdata(h):
- srpm = str(h['sourcerpm'], 'utf-8')
- binrpm = str(h['name'], 'utf-8')
+ srpm = forcestr(h['sourcerpm'])
+ binrpm = forcestr(h['name'])
evr = dict()
for tag in ['name', 'version', 'release', 'sourcerpm']:
- evr[tag] = str(h[tag], 'utf-8')
+ evr[tag] = forcestr(h[tag])
pkgdata[binrpm] = evr
# dirty hack to reduce kernel spam
@@ -80,7 +89,7 @@
):
srpm = '%s-%s-%s.src.rpm' % ('kernel-source',
m.group('version'), m.group('release'))
pkgdata[binrpm]['sourcerpm'] = srpm
- print("%s -> %s" % (str(h['sourcerpm'], 'utf-8'), srpm))
+ print("%s -> %s" % (forcestr(h['sourcerpm']), srpm))
if srpm in changelogs:
changelogs[srpm]['packages'].append(binrpm)
@@ -89,7 +98,7 @@
data['changelogtime'] = h['changelogtime']
data['changelogtext'] = h['changelogtext']
for (t, txt) in enumerate(data['changelogtext']):
- data['changelogtext'][t] = str(txt, 'utf-8')
+ data['changelogtext'][t] = forcestr(txt)
changelogs[srpm] = data
for arg in args:
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.zod51S/_old 2023-08-04 15:04:52.660824452 +0200
+++ /var/tmp/diff_new_pack.zod51S/_new 2023-08-04 15:04:52.664824477 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20230801.82c067d
-mtime: 1690897578
-commit: 82c067dc2c5e8ccdf473d82d687bdfff09f8be3e
+version: 20230804.9200c9e
+mtime: 1691140348
+commit: 9200c9e707b6bb35086a9af6802c3d1b71892ef6
