Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-12-11 12:14:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Dec 11 12:14:07 2019 rev:262 rq:755737 version:20191210.9a8ba5b5
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-12-10 22:42:39.293803959 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.4691/openSUSE-release-tools.changes
2019-12-11 12:14:31.124521764 +0100
@@ -1,0 +2,29 @@
+Tue Dec 10 12:41:41 UTC 2019 - [email protected]
+
+- Update to version 20191210.9a8ba5b5:
+ * More flake8 cleanups
+ * Sanitize read rebuild yaml
+ * Avoid crash when --store is not specified on save
+
+-------------------------------------------------------------------
+Tue Dec 10 10:49:57 UTC 2019 - [email protected]
+
+- Update to version 20191210.10a6a78a:
+ * stagingapi: StagingAPI doen't initial api itself
+
+-------------------------------------------------------------------
+Tue Dec 10 09:57:51 UTC 2019 - [email protected]
+
+- Update to version 20191210.1a22a59c:
+ * Do not return after adi project is accepted
+
+-------------------------------------------------------------------
+Tue Dec 10 08:47:31 UTC 2019 - [email protected]
+
+- Update to version 20191210.4d7223f5:
+ * Fix E203
+ * Fix Flake E241
+ * Avoid crash when store project isn't set
+ * Fix installcheck for arm architectures
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20191210.05e7447a.obscpio
New:
----
openSUSE-release-tools-20191210.9a8ba5b5.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.ThbIjB/_old 2019-12-11 12:14:33.524521088 +0100
+++ /var/tmp/diff_new_pack.ThbIjB/_new 2019-12-11 12:14:33.524521088 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20191210.05e7447a
+Version: 20191210.9a8ba5b5
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.ThbIjB/_old 2019-12-11 12:14:33.556521080 +0100
+++ /var/tmp/diff_new_pack.ThbIjB/_new 2019-12-11 12:14:33.560521078 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">05e7447a3faa926367662f77b09627d7f81ba83d</param>
+ <param
name="changesrevision">9a8ba5b54b96ed95e4f747cb9e6fdb22ea1670fe</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20191210.05e7447a.obscpio ->
openSUSE-release-tools-20191210.9a8ba5b5.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20191210.05e7447a/.flake8
new/openSUSE-release-tools-20191210.9a8ba5b5/.flake8
--- old/openSUSE-release-tools-20191210.05e7447a/.flake8 2019-12-10
02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/.flake8 2019-12-10
13:40:03.000000000 +0100
@@ -1,4 +1,4 @@
[flake8]
exclude = .open-build-service/, abichecker, openqa, openqa-maintenance.py
max-line-length = 100
-ignore =
E501,F401,E302,E128,E251,E201,E202,E203,E305,F841,E265,E261,E266,E712,E401,E126,E502,E241,E711,E125,E123,W293,W391,E101,E713,E124,E127,E701,E714,W503,W504,E129,E741,E722,E731
+ignore =
E501,F401,E128,E251,E201,E202,E302,E305,F841,E261,E265,E712,E126,E711,E125,E123,E101,E713,E124,E127,E701,E714,W504,E129,E741,E722,E731
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/ReviewBot.py
new/openSUSE-release-tools-20191210.9a8ba5b5/ReviewBot.py
--- old/openSUSE-release-tools-20191210.05e7447a/ReviewBot.py 2019-12-10
02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/ReviewBot.py 2019-12-10
13:40:03.000000000 +0100
@@ -1,7 +1,9 @@
#!/usr/bin/python3
from pprint import pprint
-import os, sys, re
+import os
+import sys
+import re
import logging
from optparse import OptionParser
import cmdln
@@ -81,7 +83,7 @@
return (None|True|False)
"""
- DEFAULT_REVIEW_MESSAGES = { 'accepted' : 'ok', 'declined': 'review failed'
}
+ DEFAULT_REVIEW_MESSAGES = { 'accepted': 'ok', 'declined': 'review failed' }
REVIEW_CHOICES = ('normal', 'no', 'accept', 'accept-onpass',
'fallback-onfail', 'fallback-always')
COMMENT_MARKER_REGEX = re.compile(r'<!-- (?P<bot>[^ ]+) state=(?P<state>[^
]+)(?: result=(?P<result>[^ ]+))? -->')
@@ -91,7 +93,7 @@
# list of tuples (prefix, apiurl, submitrequestprefix)
# set this if the obs instance maps another instance into it's
# namespace
- 'project_namespace_api_map' : [
+ 'project_namespace_api_map': [
('openSUSE.org:', 'https://api.opensuse.org', 'obsrq'),
],
}
@@ -158,7 +160,7 @@
def set_request_ids(self, ids):
for rqid in ids:
- u = osc.core.makeurl(self.apiurl, [ 'request', rqid ], {
'withfullhistory' : '1' })
+ u = osc.core.makeurl(self.apiurl, [ 'request', rqid ], {
'withfullhistory': '1' })
r = osc.core.http_GET(u)
root = ET.parse(r).getroot()
req = osc.core.Request()
@@ -826,8 +828,8 @@
def get_optparser(self):
parser = cmdln.Cmdln.get_optparser(self)
parser.add_option("--apiurl", '-A', metavar="URL", help="api url")
- parser.add_option("--user", metavar="USER", help="reviewer user name")
- parser.add_option("--group", metavar="GROUP", help="reviewer group
name")
+ parser.add_option("--user", metavar="USER", help="reviewer user name")
+ parser.add_option("--group", metavar="GROUP", help="reviewer group
name")
parser.add_option("--dry", action="store_true", help="dry run")
parser.add_option("--debug", action="store_true", help="debug output")
parser.add_option("--osc-debug", action="store_true", help="osc debug
output")
@@ -883,10 +885,10 @@
if user is None and group is None:
user = conf.get_apiurl_usr(apiurl)
- return self.clazz(apiurl = apiurl, \
- dryrun = self.options.dry, \
- user = user, \
- group = group, \
+ return self.clazz(apiurl = apiurl,
+ dryrun = self.options.dry,
+ user = user,
+ group = group,
logger = self.logger)
def do_id(self, subcmd, opts, *args):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/biarchtool.py
new/openSUSE-release-tools-20191210.9a8ba5b5/biarchtool.py
--- old/openSUSE-release-tools-20191210.05e7447a/biarchtool.py 2019-12-10
02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/biarchtool.py 2019-12-10
13:40:03.000000000 +0100
@@ -232,7 +232,7 @@
bn = pkgmeta.find('build')
if bn is None:
bn = ET.SubElement(pkgmeta, 'build')
- ET.SubElement(bn, 'disable', { 'arch' : self.arch })
+ ET.SubElement(bn, 'disable', { 'arch': self.arch })
changed = True
if changed:
@@ -243,9 +243,9 @@
self._invalidate__cached_GET(pkgmetaurl)
if wipebinaries:
self.http_POST(self.makeurl(['build', self.project], {
- 'cmd' : 'wipe',
+ 'cmd': 'wipe',
'arch': self.arch,
- 'package' : pkg }))
+ 'package': pkg }))
except HTTPError as e:
logger.error('failed to update %s: %s', pkg, e)
@@ -296,7 +296,7 @@
bn = pkgmeta.find('build')
if bn is None:
bn = ET.SubElement(pkgmeta, 'build')
- ET.SubElement(bn, 'disable', { 'arch' : self.arch })
+ ET.SubElement(bn, 'disable', { 'arch': self.arch })
changed = True
else:
logger.debug('%s already disabled for %s', pkg, self.arch)
@@ -326,9 +326,9 @@
if wipebinaries and
pkgmeta.find("./build/disable[@arch='{}']".format(self.arch)) is not None:
logger.debug("wiping %s", pkg)
self.http_POST(self.makeurl(['build', self.project], {
- 'cmd' : 'wipe',
+ 'cmd': 'wipe',
'arch': self.arch,
- 'package' : pkg }))
+ 'package': pkg }))
except HTTPError as e:
logger.error('failed to update %s: %s', pkg, e)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/build-fail-reminder.py
new/openSUSE-release-tools-20191210.9a8ba5b5/build-fail-reminder.py
--- old/openSUSE-release-tools-20191210.05e7447a/build-fail-reminder.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/build-fail-reminder.py
2019-12-10 13:40:03.000000000 +0100
@@ -176,8 +176,8 @@
text = MAIL_TEMPLATES[Reminded[package].remindCount - 1] %
{
'recipient': fullname,
'sender': sender,
- 'project' : project,
- 'package' : package,
+ 'project': project,
+ 'package': package,
'date':
time.ctime(Reminded[package].firstfail),
}
SendMail(logger, project, sender, to, fullname, subject,
text)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/check_maintenance_incidents.py
new/openSUSE-release-tools-20191210.9a8ba5b5/check_maintenance_incidents.py
--- old/openSUSE-release-tools-20191210.05e7447a/check_maintenance_incidents.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/check_maintenance_incidents.py
2019-12-10 13:40:03.000000000 +0100
@@ -1,7 +1,9 @@
#!/usr/bin/python3
from pprint import pprint
-import os, sys, re
+import os
+import re
+import sys
import logging
from optparse import OptionParser
import cmdln
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/check_source.py
new/openSUSE-release-tools-20191210.9a8ba5b5/check_source.py
--- old/openSUSE-release-tools-20191210.05e7447a/check_source.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/check_source.py
2019-12-10 13:40:03.000000000 +0100
@@ -243,7 +243,7 @@
for f in xml.findall('entry'):
# we check all repos in the source project for errors that exist
in the target project
repo = f.attrib['name']
- query = { 'last' : 1, }
+ query = { 'last': 1, }
for arch in target_archs(self.apiurl, source_project, repo):
url = osc.core.makeurl(self.apiurl, ['build', source_project,
repo, arch, source_package, '_log'], query = query)
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/check_source_in_factory.py
new/openSUSE-release-tools-20191210.9a8ba5b5/check_source_in_factory.py
--- old/openSUSE-release-tools-20191210.05e7447a/check_source_in_factory.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/check_source_in_factory.py
2019-12-10 13:40:03.000000000 +0100
@@ -1,7 +1,9 @@
#!/usr/bin/python3
from pprint import pprint
-import os, sys, re
+import os
+import sys
+import re
import logging
from optparse import OptionParser
import cmdln
@@ -28,7 +30,7 @@
def __init__(self, *args, **kwargs):
ReviewBot.ReviewBot.__init__(self, *args, **kwargs)
self.factory = [ "openSUSE:Factory" ]
- self.review_messages = { 'accepted' : 'ok', 'declined': 'the package
needs to be accepted in Factory first' }
+ self.review_messages = { 'accepted': 'ok', 'declined': 'the package
needs to be accepted in Factory first' }
self.history_limit = 5
def check_source_submission(self, src_project, src_package, src_rev,
target_project, target_package):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/check_tags_in_requests.py
new/openSUSE-release-tools-20191210.9a8ba5b5/check_tags_in_requests.py
--- old/openSUSE-release-tools-20191210.05e7447a/check_tags_in_requests.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/check_tags_in_requests.py
2019-12-10 13:40:03.000000000 +0100
@@ -138,4 +138,3 @@
if __name__ == "__main__":
app = CommandLineInterface()
sys.exit(app.main())
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/container_cleaner.py
new/openSUSE-release-tools-20191210.9a8ba5b5/container_cleaner.py
--- old/openSUSE-release-tools-20191210.05e7447a/container_cleaner.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/container_cleaner.py
2019-12-10 13:40:03.000000000 +0100
@@ -77,7 +77,7 @@
if srccontainer not in srccontainerarchs:
srccontainerarchs[srccontainer] = []
- logging.debug("%s provides binaries for %s",
srccontainer, arch)
+ logging.debug("%s provides binaries for %s", srccontainer,
arch)
srccontainerarchs[srccontainer] += [arch]
# Now go through each bucket and find out what doesn't contribute to
the newest five
@@ -97,7 +97,7 @@
contributes = True
if contributes:
- logging.debug("%s contributes to %s", srccontainer,
package)
+ logging.debug("%s contributes to %s", srccontainer,
package)
else:
logging.info("%s does not contribute", srccontainer)
if len([count for count in archs_found.values() if count >
0]) == 0:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/devel-project.py
new/openSUSE-release-tools-20191210.9a8ba5b5/devel-project.py
--- old/openSUSE-release-tools-20191210.05e7447a/devel-project.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/devel-project.py
2019-12-10 13:40:03.000000000 +0100
@@ -281,7 +281,7 @@
parser_notify = subparsers.add_parser('notify', help='notify maintainers
of their packages')
parser_notify.set_defaults(func=notify)
- parser_notify.add_argument('--dry', action='store_true', help='dry run
emails')
+ parser_notify.add_argument('--dry', action='store_true', help='dry run
emails')
parser_notify.add_argument("packages", nargs='*', help="packages to check")
parser_requests = subparsers.add_parser('requests', help='List open
requests.')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/factory-package-news/announcer.py
new/openSUSE-release-tools-20191210.9a8ba5b5/factory-package-news/announcer.py
---
old/openSUSE-release-tools-20191210.05e7447a/factory-package-news/announcer.py
2019-12-10 02:28:30.000000000 +0100
+++
new/openSUSE-release-tools-20191210.9a8ba5b5/factory-package-news/announcer.py
2019-12-10 13:40:03.000000000 +0100
@@ -21,7 +21,7 @@
'sender': '[email protected]',
'to': '[email protected]',
'relay': 'relay.suse.de',
- 'changesfile' : "Changes.{version}.txt",
+ 'changesfile': "Changes.{version}.txt",
}
def _load_config(handle = None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/factory-package-news/factory-package-news-web.py
new/openSUSE-release-tools-20191210.9a8ba5b5/factory-package-news/factory-package-news-web.py
---
old/openSUSE-release-tools-20191210.05e7447a/factory-package-news/factory-package-news-web.py
2019-12-10 02:28:30.000000000 +0100
+++
new/openSUSE-release-tools-20191210.9a8ba5b5/factory-package-news/factory-package-news-web.py
2019-12-10 13:40:03.000000000 +0100
@@ -69,7 +69,7 @@
if not os.path.exists(os.path.join(_dir, version)):
return "invalid version", 400
import subprocess
- cmd = [os.path.dirname(os.path.abspath(__file__)) +
'/factory-package-news.py', \
+ cmd = [os.path.dirname(os.path.abspath(__file__)) +
'/factory-package-news.py',
'diff', '--dir', _dir, "current", version]
app.logger.debug(cmd)
response = make_response(subprocess.check_output(cmd))
@@ -85,4 +85,3 @@
app.run(debug=options.debug, host=options.host)
application = app
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/factory-package-news/factory-package-news.py
new/openSUSE-release-tools-20191210.9a8ba5b5/factory-package-news/factory-package-news.py
---
old/openSUSE-release-tools-20191210.05e7447a/factory-package-news/factory-package-news.py
2019-12-10 02:28:30.000000000 +0100
+++
new/openSUSE-release-tools-20191210.9a8ba5b5/factory-package-news/factory-package-news.py
2019-12-10 13:40:03.000000000 +0100
@@ -1,7 +1,9 @@
#!/usr/bin/python3
from pprint import pprint
-import os, sys, io
+import io
+import os
+import sys
import logging
from optparse import OptionParser
import rpm
@@ -103,8 +105,8 @@
raise Exception("Could not open %s as an ISO-9660 image."
% arg)
# On Tumbleweed, there is no '/suse' prefix
- for path in ['/suse/x86_64', '/suse/noarch', '/suse/aarch64',
'/suse/s390x',
- '/x86_64', '/noarch', '/aarch64',
'/s390x' ]:
+ for path in ['/suse/x86_64', '/suse/noarch', '/suse/aarch64',
+ '/suse/s390x', '/x86_64', '/noarch', '/aarch64',
'/s390x' ]:
file_stats = iso.readdir(path)
if file_stats is None:
continue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/manager_42.py
new/openSUSE-release-tools-20191210.9a8ba5b5/manager_42.py
--- old/openSUSE-release-tools-20191210.05e7447a/manager_42.py 2019-12-10
02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/manager_42.py 2019-12-10
13:40:03.000000000 +0100
@@ -33,17 +33,17 @@
class Manager42(object):
config_defaults = {
- 'ignored_packages' : [
+ 'ignored_packages': [
'00Meta',
'00aggregates',
'000product',
'000package-groups',
'000release-packages',
],
- 'project_preference_order' : [],
- 'drop_if_vanished_from' : [],
- 'from_prj' : 'openSUSE:Leap:42.3',
- 'factory' : 'openSUSE:Factory',
+ 'project_preference_order': [],
+ 'drop_if_vanished_from': [],
+ 'from_prj': 'openSUSE:Leap:42.3',
+ 'factory': 'openSUSE:Factory',
}
def __init__(self, caching = True, configfh = None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20191210.05e7447a/metrics.py
new/openSUSE-release-tools-20191210.9a8ba5b5/metrics.py
--- old/openSUSE-release-tools-20191210.05e7447a/metrics.py 2019-12-10
02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/metrics.py 2019-12-10
13:40:03.000000000 +0100
@@ -211,7 +211,7 @@
tags['type'] = '_'.join(tags['type'])
point('review', {'open_for': (completed_at -
opened_at).total_seconds()}, completed_at, tags)
- point('review_count', {'count': 1}, opened_at, tags, True)
+ point('review_count', {'count': 1}, opened_at, tags, True)
point('review_count', {'count': -1}, completed_at, tags, True)
found = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/osc-origin.py
new/openSUSE-release-tools-20191210.9a8ba5b5/osc-origin.py
--- old/openSUSE-release-tools-20191210.05e7447a/osc-origin.py 2019-12-10
02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/osc-origin.py 2019-12-10
13:40:03.000000000 +0100
@@ -115,7 +115,7 @@
if opts.origins_only:
print('\n'.join(config_origin_list(config)))
else:
- yaml.Dumper.ignore_aliases = lambda *args : True
+ yaml.Dumper.ignore_aliases = lambda *args: True
print(yaml.dump(config))
def osrt_origin_cron(apiurl, opts, *args):
@@ -331,7 +331,7 @@
report = [line_format.format(*columns)]
total = len(lookup)
- for origin, count in sorted(origin_count.items(), key=lambda x : x[1],
reverse=True):
+ for origin, count in sorted(origin_count.items(), key=lambda x: x[1],
reverse=True):
values = [origin, count, round(float(count) / total * 100, 2)]
if opts.diff:
values.insert(2, origin_count_change.get(origin, 0))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/osclib/accept_command.py
new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/accept_command.py
--- old/openSUSE-release-tools-20191210.05e7447a/osclib/accept_command.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/accept_command.py
2019-12-10 13:40:03.000000000 +0100
@@ -115,7 +115,7 @@
print(f"Accepting request {req['id']}: {req['package']}")
change_request_state(self.api.apiurl, str(req['id']), 'accepted',
message='Accept to %s' % self.api.project)
- for project in staging_packages.keys():
+ for project in sorted(staging_packages.keys()):
print(f'waiting for staging project {project} to be accepted')
while True:
@@ -128,11 +128,11 @@
self.api.accept_status_comment(project, staging_packages[project])
if self.api.is_adi_project(project):
self.api.delete_empty_adi_project(project)
- return
+ continue
self.api.staging_deactivate(project)
- self.reset_rebuild_data(prj)
+ self.reset_rebuild_data(project)
if cleanup:
self.cleanup(project)
@@ -249,7 +249,7 @@
if product_spec != new_product:
update_version_attr = True
- url = self.api.makeurl(['source', project, product_pkg,
product_name])
+ url = self.api.makeurl(['source', project, product_pkg,
product_name])
http_PUT(url + '?comment=Update+version', data=new_product)
if update_version_attr:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/osclib/cleanup_rings.py
new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/cleanup_rings.py
--- old/openSUSE-release-tools-20191210.05e7447a/osclib/cleanup_rings.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/cleanup_rings.py
2019-12-10 13:40:03.000000000 +0100
@@ -73,7 +73,7 @@
self.links[mainpkg] = pkg
def fill_pkgdeps(self, prj, repo, arch):
- root = builddepinfo(self.api.apiurl, prj, repo, arch)
+ root = builddepinfo(self.api.apiurl, prj, repo, arch)
for package in root.findall('package'):
# use main package name for multibuild. We can't just ignore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/osclib/core.py
new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/core.py
--- old/openSUSE-release-tools-20191210.05e7447a/osclib/core.py 2019-12-10
02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/core.py 2019-12-10
13:40:03.000000000 +0100
@@ -314,7 +314,7 @@
url = makeurl(apiurl, ['source', project, package, filename], {'comment':
comment})
http_PUT(url, data=content)
-def source_file_ensure(apiurl, project, package, filename, content,
comment=None):
+def source_file_ensure(apiurl, project, package, filename, content,
comment=None):
if content != source_file_load(apiurl, project, package, filename):
source_file_save(apiurl, project, package, filename, content, comment)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/osclib/repochecks.py
new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/repochecks.py
--- old/openSUSE-release-tools-20191210.05e7447a/osclib/repochecks.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/repochecks.py
2019-12-10 13:40:03.000000000 +0100
@@ -93,7 +93,14 @@
if not len(target_packages):
return reported_problems
- p = subprocess.run(['/usr/bin/installcheck', arch, pfile],
+ def maparch2installarch(arch):
+ _mapping = {'armv6l': 'armv6hl',
+ 'armv7l': 'armv7hl'}
+ if arch in _mapping:
+ return _mapping[arch]
+ return arch
+
+ p = subprocess.run(['/usr/bin/installcheck', maparch2installarch(arch),
pfile],
stdout=subprocess.PIPE, errors='backslashreplace',
text=True)
if p.returncode:
in_problem = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/osclib/stagingapi.py
new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/stagingapi.py
--- old/openSUSE-release-tools-20191210.05e7447a/osclib/stagingapi.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/osclib/stagingapi.py
2019-12-10 13:40:03.000000000 +0100
@@ -1262,7 +1262,7 @@
if root.get('state') == 'empty':
# Cleanup like accept since the staging is now empty.
if self.is_adi_project(project):
- self.api.delete_empty_adi_project(project)
+ self.delete_empty_adi_project(project)
else:
self.staging_deactivate(project)
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/project-installcheck.py
new/openSUSE-release-tools-20191210.9a8ba5b5/project-installcheck.py
--- old/openSUSE-release-tools-20191210.05e7447a/project-installcheck.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/project-installcheck.py
2019-12-10 13:40:03.000000000 +0100
@@ -24,7 +24,7 @@
project_pseudometa_file_ensure,
repository_path_expand, repository_path_search,
target_archs, source_file_load, source_file_ensure)
-from osclib.repochecks import installcheck, mirror, parsed_installcheck,
CorruptRepos
+from osclib.repochecks import mirror, parsed_installcheck, CorruptRepos
class RepoChecker():
def __init__(self):
@@ -97,6 +97,9 @@
return repository
def store_yaml(self, state, project, repository, arch):
+ if not self.store_project or not self.store_package:
+ return
+
state_yaml = yaml.dump(state, default_flow_style=False)
comment = 'Updated rebuild infos for {}/{}/{}'.format(project,
repository, arch)
source_file_ensure(self.apiurl, self.store_project, self.store_package,
@@ -107,14 +110,19 @@
oldstate = None
self.store_filename = 'rebuildpacs.{}-{}.yaml'.format(project,
repository)
- state_yaml = source_file_load(self.apiurl, self.store_project,
self.store_package,
- self.store_filename)
- if state_yaml:
- oldstate = yaml.safe_load(state_yaml)
+ if self.store_project and self.store_package:
+ state_yaml = source_file_load(self.apiurl, self.store_project,
self.store_package,
+ self.store_filename)
+ if state_yaml:
+ oldstate = yaml.safe_load(state_yaml)
oldstate = oldstate or {}
oldstate.setdefault('check', {})
+ if not isinstance(oldstate['check'], dict):
+ oldstate['check'] = {}
oldstate.setdefault('leafs', {})
+ if not isinstance(oldstate['leafs'], dict):
+ oldstate['leafs'] = {}
repository_pairs = repository_path_expand(self.apiurl, project,
repository)
directories = []
@@ -186,7 +194,7 @@
for line in difflib.unified_diff(old_output,
per_source[source]['output'], 'before', 'now'):
self.logger.debug(line.strip())
oldstate['check'][source] = {'problem':
per_source[source]['output'],
- 'rebuild':
str(datetime.datetime.now())}
+ 'rebuild':
str(datetime.datetime.now())}
for source in list(oldstate['check']):
if not source.startswith('{}/{}/{}/'.format(project, repository,
arch)):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/scan_baselibs.py
new/openSUSE-release-tools-20191210.9a8ba5b5/scan_baselibs.py
--- old/openSUSE-release-tools-20191210.05e7447a/scan_baselibs.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/scan_baselibs.py
2019-12-10 13:40:03.000000000 +0100
@@ -52,11 +52,11 @@
return False
def package_has_32bit_binaries(self, project, repo, package):
- query = { 'package' : package,
- 'repository' : repo,
- 'arch' : 'x86_64',
- 'multibuild' : 1,
- 'view' : 'binarylist' }
+ query = { 'package': package,
+ 'repository': repo,
+ 'arch': 'x86_64',
+ 'multibuild': 1,
+ 'view': 'binarylist' }
root = ET.parse(http_GET(makeurl(self.apiurl, ['build', project,
'_result'], query = query))).getroot()
# assume 32bit importing RPMs can be appeared in multibuild-ed package
for binarylist in root.findall('./result/binarylist'):
@@ -81,10 +81,10 @@
print('%s has baselibs.conf but 32bit RPMs does
not exist on 64bit\'s build result.' % pkg)
if wipebinaries:
http_POST(makeurl(self.apiurl, ['build', project],
{
- 'cmd' : 'wipe',
- 'repository' : repo,
- 'package' : pkg,
- 'arch' : 'i586' }))
+ 'cmd': 'wipe',
+ 'repository': repo,
+ 'package': pkg,
+ 'arch': 'i586' }))
f.close()
def scan(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/tests/OBSLocal.py
new/openSUSE-release-tools-20191210.9a8ba5b5/tests/OBSLocal.py
--- old/openSUSE-release-tools-20191210.05e7447a/tests/OBSLocal.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/tests/OBSLocal.py
2019-12-10 13:40:03.000000000 +0100
@@ -312,7 +312,7 @@
source_package.name))
return target_package
- def create_project(self, name, reviewer={}, maintainer={},
project_links=[]):
+ def create_project(self, name, reviewer={}, maintainer={},
project_links=[]):
if isinstance(name, Project):
return name
if name in self.projects:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/tests/factory_source_tests.py
new/openSUSE-release-tools-20191210.9a8ba5b5/tests/factory_source_tests.py
--- old/openSUSE-release-tools-20191210.05e7447a/tests/factory_source_tests.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/tests/factory_source_tests.py
2019-12-10 13:40:03.000000000 +0100
@@ -42,8 +42,8 @@
self.logger = logging.getLogger(__file__)
self.logger.setLevel(logging.DEBUG)
- self.checker = FactorySourceChecker(apiurl = APIURL, \
- user = 'factory-source', \
+ self.checker = FactorySourceChecker(apiurl = APIURL,
+ user = 'factory-source',
logger = self.logger)
self.checker.override_allow = False # Test setup cannot handle.
@@ -142,7 +142,7 @@
""")
])
- result = { 'status' : None }
+ result = { 'status': None }
def change_request(result, method, uri, headers):
query = parse_qs(urlparse(uri).query)
@@ -265,7 +265,7 @@
</collection>
""")
- result = { 'factory_source_declined' : None }
+ result = { 'factory_source_declined': None }
def change_request(result, method, uri, headers):
query = parse_qs(urlparse(uri).query)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191210.05e7447a/tests/maintenance_tests.py
new/openSUSE-release-tools-20191210.9a8ba5b5/tests/maintenance_tests.py
--- old/openSUSE-release-tools-20191210.05e7447a/tests/maintenance_tests.py
2019-12-10 02:28:30.000000000 +0100
+++ new/openSUSE-release-tools-20191210.9a8ba5b5/tests/maintenance_tests.py
2019-12-10 13:40:03.000000000 +0100
@@ -37,8 +37,8 @@
self.logger = logging.getLogger(__file__)
self.logger.setLevel(logging.DEBUG)
- self.checker = MaintenanceChecker(apiurl = APIURL, \
- user = 'maintbot', \
+ self.checker = MaintenanceChecker(apiurl = APIURL,
+ user = 'maintbot',
logger = self.logger)
self.checker.override_allow = False # Test setup cannot handle.
@@ -119,7 +119,7 @@
</directory>
""")
- result = { 'devel_review_added' : None }
+ result = { 'devel_review_added': None }
def change_request(result, method, uri, headers):
query = parse_qs(urlparse(uri).query)
@@ -237,7 +237,7 @@
</directory>
""")
- result = { 'devel_review_added' : None }
+ result = { 'devel_review_added': None }
def change_request(result, method, uri, headers):
u = urlparse(uri)
@@ -335,7 +335,7 @@
<collection/>
""")
- result = { 'factory_review_added' : None }
+ result = { 'factory_review_added': None }
def change_request(result, method, uri, headers):
query = parse_qs(urlparse(uri).query)
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.ThbIjB/_old 2019-12-11 12:14:34.100520927 +0100
+++ /var/tmp/diff_new_pack.ThbIjB/_new 2019-12-11 12:14:34.100520927 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20191210.05e7447a
-mtime: 1575941310
-commit: 05e7447a3faa926367662f77b09627d7f81ba83d
+version: 20191210.9a8ba5b5
+mtime: 1575981603
+commit: 9a8ba5b54b96ed95e4f747cb9e6fdb22ea1670fe
