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-06-13 16:11:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue Jun 13 16:11:09 2023 rev:468 rq:1092862 version:20230613.f09ff89
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2023-06-08 21:42:12.705867149 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.15902/openSUSE-release-tools.changes
2023-06-13 16:11:12.359485712 +0200
@@ -1,0 +2,8 @@
+Tue Jun 13 12:06:45 UTC 2023 - [email protected]
+
+- Update to version 20230613.f09ff89:
+ * project-installcheck.py: Honour installcheck-ignore-conflicts config
+ * project-installcheck.py: target_packages is a dict, not a list
+ * project-installcheck.py: Move some code out of a with block
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20230606.7297d89.obscpio
New:
----
openSUSE-release-tools-20230613.f09ff89.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.kz2Ky1/_old 2023-06-13 16:11:13.183490572 +0200
+++ /var/tmp/diff_new_pack.kz2Ky1/_new 2023-06-13 16:11:13.195490644 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20230606.7297d89
+Version: 20230613.f09ff89
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.kz2Ky1/_old 2023-06-13 16:11:13.243490927 +0200
+++ /var/tmp/diff_new_pack.kz2Ky1/_new 2023-06-13 16:11:13.247490950 +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">7297d89bc6d33136f79e524550fa46e7c0f42133</param>
+ <param
name="changesrevision">f09ff898fb193973282ffc6dc959c66106fcca2c</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20230606.7297d89.obscpio ->
openSUSE-release-tools-20230613.f09ff89.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20230606.7297d89/project-installcheck.py
new/openSUSE-release-tools-20230613.f09ff89/project-installcheck.py
--- old/openSUSE-release-tools-20230606.7297d89/project-installcheck.py
2023-06-06 13:20:03.000000000 +0200
+++ new/openSUSE-release-tools-20230613.f09ff89/project-installcheck.py
2023-06-13 14:05:25.000000000 +0200
@@ -204,27 +204,28 @@
# so if some other perl error happens, we don't continue
raise CorruptRepos
- target_packages = []
+ target_packages = {}
with open(os.path.join(dir, 'catalog.yml')) as file:
catalog = yaml.safe_load(file)
if catalog is not None:
target_packages = catalog.get(directories[0], [])
parsed = parsed_installcheck([pfile] + primaryxmls, arch,
target_packages, [])
- for package in parsed:
- parsed[package]['output'] =
"\n".join(parsed[package]['output'])
- # let's risk a N*N algorithm in the hope that we have a limited N
- for package1 in parsed:
- output = parsed[package1]['output']
- for package2 in parsed:
- if package1 == package2:
- continue
- output = output.replace(parsed[package2]['output'],
'FOLLOWUP(' + package2 + ')')
- parsed[package1]['output'] = output
+ for package in parsed:
+ parsed[package]['output'] = "\n".join(parsed[package]['output'])
- for package in parsed:
- parsed[package]['output'] =
self._split_and_filter(parsed[package]['output'])
+ # let's risk a N*N algorithm in the hope that we have a limited N
+ for package1 in parsed:
+ output = parsed[package1]['output']
+ for package2 in parsed:
+ if package1 == package2:
+ continue
+ output = output.replace(parsed[package2]['output'],
'FOLLOWUP(' + package2 + ')')
+ parsed[package1]['output'] = output
+
+ for package in parsed:
+ parsed[package]['output'] =
self._split_and_filter(parsed[package]['output'])
url = makeurl(self.apiurl, ['build', project, '_result'],
{'repository': repository, 'arch': arch})
root = ET.parse(http_GET(url)).getroot()
@@ -239,10 +240,14 @@
per_source = dict()
+ ignore_conflicts = Config.get(self.apiurl,
project).get('installcheck-ignore-conflicts', '').split(' ')
+
for package, entry in parsed.items():
source = "{}/{}/{}/{}".format(project, repository, arch,
entry['source'])
- per_source.setdefault(source, {'output': [], 'buildresult':
buildresult.get(entry['source'], 'gone')})
+ per_source.setdefault(source, {'output': [], 'buildresult':
buildresult.get(entry['source'], 'gone'), 'ignored': True})
per_source[source]['output'].extend(entry['output'])
+ if package not in ignore_conflicts:
+ per_source[source]['ignored'] = False
rebuilds = set()
@@ -253,6 +258,9 @@
self.logger.debug(" " + "\n ".join(per_source[source]['output']))
if per_source[source]['buildresult'] != 'succeeded': # nothing we
can do
continue
+ if per_source[source]['ignored']:
+ self.logger.debug("All binaries failing the check are ignored")
+ continue
old_output = oldstate['check'].get(source, {}).get('problem', [])
if sorted(old_output) == sorted(per_source[source]['output']):
self.logger.debug("unchanged problem")
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.kz2Ky1/_old 2023-06-13 16:11:14.051495693 +0200
+++ /var/tmp/diff_new_pack.kz2Ky1/_new 2023-06-13 16:11:14.051495693 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20230606.7297d89
-mtime: 1686050403
-commit: 7297d89bc6d33136f79e524550fa46e7c0f42133
+version: 20230613.f09ff89
+mtime: 1686657925
+commit: f09ff898fb193973282ffc6dc959c66106fcca2c
