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-01 21:36:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Fri Apr 1 21:36:05 2022 rev:416 rq:966368 version:20220401.69e19f82
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-03-31 17:19:08.060970467 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1900/openSUSE-release-tools.changes
2022-04-01 21:37:21.864668923 +0200
@@ -1,0 +2,6 @@
+Fri Apr 01 09:03:37 UTC 2022 - opensuse-releaset...@opensuse.org
+
+- Update to version 20220401.69e19f82:
+ * Keep images repository disabled on freeze command
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220330.1114fbdd.obscpio
New:
----
openSUSE-release-tools-20220401.69e19f82.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.ReNfVz/_old 2022-04-01 21:37:22.952656990 +0200
+++ /var/tmp/diff_new_pack.ReNfVz/_new 2022-04-01 21:37:22.956656946 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220330.1114fbdd
+Version: 20220401.69e19f82
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.ReNfVz/_old 2022-04-01 21:37:23.012656332 +0200
+++ /var/tmp/diff_new_pack.ReNfVz/_new 2022-04-01 21:37:23.016656288 +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">1114fbdd30d0d4506ca3767d2e5d563bf076304f</param>
+ <param
name="changesrevision">044f19b7dca40683be8ccb7e1f270c18027f212d</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220330.1114fbdd.obscpio ->
openSUSE-release-tools-20220401.69e19f82.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220330.1114fbdd/osclib/freeze_command.py
new/openSUSE-release-tools-20220401.69e19f82/osclib/freeze_command.py
--- old/openSUSE-release-tools-20220330.1114fbdd/osclib/freeze_command.py
2022-03-30 16:20:50.000000000 +0200
+++ new/openSUSE-release-tools-20220401.69e19f82/osclib/freeze_command.py
2022-04-01 11:01:45.000000000 +0200
@@ -28,7 +28,7 @@
f = self.api.retried_GET(url)
oldmeta = ET.parse(f).getroot()
- meta = ET.fromstring(self.prj_meta_for_bootstrap_copy(self.prj))
+ meta = ET.fromstring(self.prj_meta_for_bootstrap_copy())
meta.find('title').text = oldmeta.find('title').text
meta.find('description').text = oldmeta.find('description').text
for person in oldmeta.findall('person'):
@@ -37,6 +37,9 @@
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'
+
def create_bootstrap_aggregate(self):
self.create_bootstrap_aggregate_meta()
self.create_bootstrap_aggregate_file()
@@ -144,8 +147,8 @@
# Set the original build status for the project
self.api.build_switch_prj(prj, build_status)
- def prj_meta_for_bootstrap_copy(self, prj):
- root = ET.Element('project', {'name': prj})
+ def prj_meta_for_bootstrap_copy(self):
+ root = ET.Element('project', {'name': self.prj})
ET.SubElement(root, 'title')
ET.SubElement(root, 'description')
links = self.projectlinks or ['{}:1-MinimalX'.format(self.api.crings)]
@@ -158,7 +161,10 @@
ET.SubElement(f, 'disable')
f = ET.SubElement(root, 'publish')
ET.SubElement(f, 'disable')
- ET.SubElement(f, 'enable', {'repository': 'images'})
+ images_flag = 'enable'
+ if self.is_images_disabled():
+ images_flag = 'disable'
+ ET.SubElement(f, images_flag, {'repository': 'images'})
f = ET.SubElement(root, 'debuginfo')
ET.SubElement(f, 'enable')
@@ -169,15 +175,15 @@
a.text = arch
r = ET.SubElement(root, 'repository', {'name': 'standard',
'linkedbuild': 'all', 'rebuild': 'direct'})
- ET.SubElement(r, 'path', {'project': prj, 'repository':
'bootstrap_copy'})
+ ET.SubElement(r, 'path', {'project': self.prj, 'repository':
'bootstrap_copy'})
for arch in self.api.cstaging_archs:
a = ET.SubElement(r, 'arch')
a.text = arch
r = ET.SubElement(root, 'repository', {'name': 'images',
'linkedbuild': 'all'})
- ET.SubElement(r, 'path', {'project': prj, 'repository': 'standard'})
+ ET.SubElement(r, 'path', {'project': self.prj, 'repository':
'standard'})
- if prj.startswith('SUSE:'):
+ if self.prj.startswith('SUSE:'):
a = ET.SubElement(r, 'arch')
a.text = 'local'
a = ET.SubElement(r, 'arch')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220330.1114fbdd/tests/freeze_tests.py
new/openSUSE-release-tools-20220401.69e19f82/tests/freeze_tests.py
--- old/openSUSE-release-tools-20220330.1114fbdd/tests/freeze_tests.py
2022-03-30 16:20:50.000000000 +0200
+++ new/openSUSE-release-tools-20220401.69e19f82/tests/freeze_tests.py
2022-04-01 11:01:45.000000000 +0200
@@ -27,10 +27,11 @@
fc = FreezeCommand(wf.api)
fp = self._get_fixture_path('staging-meta-for-bootstrap-copy.xml')
+ fc.prj = 'openSUSE:Factory:Staging:A'
fixture = subprocess.check_output('/usr/bin/xmllint --format %s' % fp,
shell=True).decode('utf-8')
f = tempfile.NamedTemporaryFile(delete=False)
- f.write(fc.prj_meta_for_bootstrap_copy('openSUSE:Factory:Staging:A'))
+ f.write(fc.prj_meta_for_bootstrap_copy())
f.close()
output = subprocess.check_output('/usr/bin/xmllint --format %s' %
f.name, shell=True).decode('utf-8')
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.ReNfVz/_old 2022-04-01 21:37:23.780647908 +0200
+++ /var/tmp/diff_new_pack.ReNfVz/_new 2022-04-01 21:37:23.784647864 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20220330.1114fbdd
-mtime: 1648650050
-commit: 1114fbdd30d0d4506ca3767d2e5d563bf076304f
+version: 20220401.69e19f82
+mtime: 1648803705
+commit: 69e19f820a0957f39604df0ad1fbccc1a9fbb7e2
