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 2022-02-02 22:41:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Feb 2 22:41:50 2022 rev:370 rq:950714 version:20220202.75645389
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-01-26 21:27:50.545637481 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1898/openSUSE-release-tools.changes
2022-02-02 22:42:48.970961487 +0100
@@ -1,0 +2,6 @@
+Wed Feb 02 11:13:43 UTC 2022 - [email protected]
+
+- Update to version 20220202.75645389:
+ * Check whether the FTP trees contain OSRT:ProductVersion before releasing
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220126.2d5e72db.obscpio
New:
----
openSUSE-release-tools-20220202.75645389.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.CJ6vnN/_old 2022-02-02 22:42:49.874955360 +0100
+++ /var/tmp/diff_new_pack.CJ6vnN/_new 2022-02-02 22:42:49.878955332 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220126.2d5e72db
+Version: 20220202.75645389
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.CJ6vnN/_old 2022-02-02 22:42:49.934954953 +0100
+++ /var/tmp/diff_new_pack.CJ6vnN/_new 2022-02-02 22:42:49.938954926 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">34fc21abc1bce9f414af9e524b2119001f97587b</param>
+ <param
name="changesrevision">231bad39a867eeb5bb6dc0f51d8a02c03cf57612</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220126.2d5e72db.obscpio ->
openSUSE-release-tools-20220202.75645389.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220126.2d5e72db/ttm/manager.py
new/openSUSE-release-tools-20220202.75645389/ttm/manager.py
--- old/openSUSE-release-tools-20220126.2d5e72db/ttm/manager.py 2022-01-26
09:25:10.000000000 +0100
+++ new/openSUSE-release-tools-20220202.75645389/ttm/manager.py 2022-02-02
12:10:57.000000000 +0100
@@ -124,6 +124,9 @@
def get_status(self, status):
return self.get_status_dict().get(status)
+ def get_product_version(self):
+ return self.api.attribute_value_load('ProductVersion')
+
def release_package(self, project, package, set_release=None,
repository=None,
target_project=None, target_repository=None):
query = {'cmd': 'release'}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220126.2d5e72db/ttm/releaser.py
new/openSUSE-release-tools-20220202.75645389/ttm/releaser.py
--- old/openSUSE-release-tools-20220126.2d5e72db/ttm/releaser.py
2022-01-26 09:25:10.000000000 +0100
+++ new/openSUSE-release-tools-20220202.75645389/ttm/releaser.py
2022-02-02 12:10:57.000000000 +0100
@@ -229,6 +229,17 @@
self.project.product_repo, arch):
return False
+ # The FTP tree isn't released with setrelease, so it needs to contain
+ # the product version already.
+ product_version = self.get_product_version()
+ if product_version is not None:
+ for product in self.project.ftp_products:
+ for binary in self.binaries_of_product(self.project.name,
product):
+ # The NonOSS tree doesn't include the version...
+ if binary.endswith('.report') and 'NonOss' not in binary
and product_version not in binary:
+ self.logger.debug(f'{binary} in {product} does not
include {product_version}')
+ return False
+
if self.project.need_same_build_number:
# make sure all medias have the same build number
builds = set()
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.CJ6vnN/_old 2022-02-02 22:42:50.610950371 +0100
+++ /var/tmp/diff_new_pack.CJ6vnN/_new 2022-02-02 22:42:50.610950371 +0100
@@ -1,6 +1,5 @@
name: openSUSE-release-tools
-version: 20220126.2d5e72db
-mtime: 1643185510
-commit: 2d5e72db80939b95fc449006125d436c7203d11e
-
+version: 20220202.75645389
+mtime: 1643800257
+commit: 756453896d9c7ad96bbd27dafc524acbbee12cd2
