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-04-05 19:55:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue Apr 5 19:55:34 2022 rev:420 rq:966927 version:20220404.3e495a4f
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-04-04 19:27:27.519803780 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1900/openSUSE-release-tools.changes
2022-04-05 19:56:00.305864550 +0200
@@ -1,0 +2,6 @@
+Mon Apr 04 16:03:57 UTC 2022 - [email protected]
+
+- Update to version 20220404.3e495a4f:
+ * Don't play with the publish flag on freeze, images only switches build flag
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220404.60a2101e.obscpio
New:
----
openSUSE-release-tools-20220404.3e495a4f.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.H7Neax/_old 2022-04-05 19:56:01.169854917 +0200
+++ /var/tmp/diff_new_pack.H7Neax/_new 2022-04-05 19:56:01.173854872 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220404.60a2101e
+Version: 20220404.3e495a4f
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.H7Neax/_old 2022-04-05 19:56:01.221854338 +0200
+++ /var/tmp/diff_new_pack.H7Neax/_new 2022-04-05 19:56:01.225854292 +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">063b014205cca4ede475ab1e07272a3ba83c7965</param>
+ <param
name="changesrevision">27c4ae0a061726b6e394a7f782b75d5c9c2dfcf4</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220404.60a2101e.obscpio ->
openSUSE-release-tools-20220404.3e495a4f.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220404.60a2101e/osclib/freeze_command.py
new/openSUSE-release-tools-20220404.3e495a4f/osclib/freeze_command.py
--- old/openSUSE-release-tools-20220404.60a2101e/osclib/freeze_command.py
2022-04-04 15:12:39.000000000 +0200
+++ new/openSUSE-release-tools-20220404.3e495a4f/osclib/freeze_command.py
2022-04-04 17:59:14.000000000 +0200
@@ -38,7 +38,12 @@
self.api.retried_PUT(url, ET.tostring(meta))
def is_images_disabled(self):
- return self.api.get_flag_in_prj(self.prj, flag='build',
repository='images') == 'disable'
+ flag = self.api.get_flag_in_prj(self.prj, flag='build',
repository='images')
+ if flag == 'disable':
+ return True
+ if flag == 'enable':
+ return False
+ return self.api.get_flag_in_prj(self.prj, flag='build') == 'disable'
def create_bootstrap_aggregate(self):
self.create_bootstrap_aggregate_meta()
@@ -126,6 +131,7 @@
self.copy_weakremovers()
build_status = self.api.get_flag_in_prj(prj, flag='build')
+ images_status = self.api.get_flag_in_prj(prj, flag='build',
repository='images')
# If there is not a bootstrap repository, there is not
# anything more to do.
@@ -146,6 +152,9 @@
# Set the original build status for the project
self.api.build_switch_prj(prj, build_status)
+ # if we build we *might* want to enable images as well (but only if
preexistant)
+ if build_status == 'enable':
+ self.api.build_switch_prj(prj, images_status, repository='images')
def prj_meta_for_bootstrap_copy(self):
root = ET.Element('project', {'name': self.prj})
@@ -154,17 +163,22 @@
links = self.projectlinks or ['{}:1-MinimalX'.format(self.api.crings)]
for lprj in links:
ET.SubElement(root, 'link', {'project': lprj})
+
+ # build flag
f = ET.SubElement(root, 'build')
- # this one stays
- ET.SubElement(f, 'disable', {'repository': 'bootstrap_copy'})
# this one is the global toggle
ET.SubElement(f, 'disable')
+ # this one stays
+ ET.SubElement(f, 'disable', {'repository': 'bootstrap_copy'})
+ # to be flipped by botmaster
+ ET.SubElement(f, 'disable', {'repository': 'images'})
+
+ # publish flag
f = ET.SubElement(root, 'publish')
ET.SubElement(f, 'disable')
- images_flag = 'enable'
- if self.is_images_disabled():
- images_flag = 'disable'
- ET.SubElement(f, images_flag, {'repository': 'images'})
+ ET.SubElement(f, 'enable', {'repository': 'images'})
+
+ # debuginfo flag
f = ET.SubElement(root, 'debuginfo')
ET.SubElement(f, 'enable')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220404.60a2101e/osclib/stagingapi.py
new/openSUSE-release-tools-20220404.3e495a4f/osclib/stagingapi.py
--- old/openSUSE-release-tools-20220404.60a2101e/osclib/stagingapi.py
2022-04-04 15:12:39.000000000 +0200
+++ new/openSUSE-release-tools-20220404.3e495a4f/osclib/stagingapi.py
2022-04-04 17:59:14.000000000 +0200
@@ -1144,7 +1144,7 @@
section = root.find(flag)
if section is None:
# the default for build and publish (is all we care for)
- return 'enabled'
+ return 'enable'
for status in section:
is_repository = status.get('repository', None) == repository
is_arch = status.get('arch', None) == arch
@@ -1160,13 +1160,13 @@
url = self.makeurl(['source', project], query)
http_POST(url)
- def build_switch_prj(self, project, state):
+ def build_switch_prj(self, project, state, repository=None, arch=None):
"""
Switch build state of project to desired state
:param project: project to switch state for
:param state: desired state for build
"""
- self.switch_flag_in_prj(project, flag='build', state=state,
repository=None, arch=None)
+ self.switch_flag_in_prj(project, flag='build', state=state,
repository=repository, arch=arch)
def prj_frozen_enough(self, project):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220404.60a2101e/tests/fixtures/staging-meta-for-bootstrap-copy.xml
new/openSUSE-release-tools-20220404.3e495a4f/tests/fixtures/staging-meta-for-bootstrap-copy.xml
---
old/openSUSE-release-tools-20220404.60a2101e/tests/fixtures/staging-meta-for-bootstrap-copy.xml
2022-04-04 15:12:39.000000000 +0200
+++
new/openSUSE-release-tools-20220404.3e495a4f/tests/fixtures/staging-meta-for-bootstrap-copy.xml
2022-04-04 17:59:14.000000000 +0200
@@ -3,8 +3,9 @@
<description></description>
<link project="openSUSE:Factory:Rings:1-MinimalX"/>
<build>
- <disable repository="bootstrap_copy"/>
<disable/>
+ <disable repository="bootstrap_copy"/>
+ <disable repository="images"/>
</build>
<publish>
<disable/>
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.H7Neax/_old 2022-04-05 19:56:01.821847648 +0200
+++ /var/tmp/diff_new_pack.H7Neax/_new 2022-04-05 19:56:01.821847648 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20220404.60a2101e
-mtime: 1649077959
-commit: 60a2101ef9106f5667d36162a046e5f7c1f925b3
+version: 20220404.3e495a4f
+mtime: 1649087954
+commit: 3e495a4f1e409f9ec25390af8987b07463587b85
