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 2021-09-22 22:12:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Sep 22 22:12:54 2021 rev:330 rq:920805 version:20210921.009ead7b
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2021-09-21 21:14:20.158719605 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1899/openSUSE-release-tools.changes
2021-09-22 22:13:06.364330453 +0200
@@ -1,0 +2,17 @@
+Tue Sep 21 13:27:06 UTC 2021 - [email protected]
+
+- Update to version 20210921.009ead7b:
+ * Remove E265 from flake ignore list
+ * Make use of the 15.3 miniobs container
+
+-------------------------------------------------------------------
+Tue Sep 21 12:52:35 UTC 2021 - [email protected]
+
+- Update to version 20210921.9fa0b78b:
+ * Remove E713 offense from flaker
+ * pkglistgen: Accept i686 as well
+ * pkglistgen: replace if not a in with if a not in
+ * pkglistgen: Fix architecture handling of weakremovers
+ * gocd: Use python3 -u for pkglistgen
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20210921.22ab5cba.obscpio
New:
----
openSUSE-release-tools-20210921.009ead7b.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.dUfW98/_old 2021-09-22 22:13:07.956331777 +0200
+++ /var/tmp/diff_new_pack.dUfW98/_new 2021-09-22 22:13:07.960331780 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20210921.22ab5cba
+Version: 20210921.009ead7b
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.dUfW98/_old 2021-09-22 22:13:08.020331830 +0200
+++ /var/tmp/diff_new_pack.dUfW98/_new 2021-09-22 22:13:08.020331830 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">b1bcbf7399e862d3fb6b4c94a5b602a31caee2e3</param>
+ <param
name="changesrevision">009ead7be35c96674e19b81eea08612ae19f5e8a</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20210921.22ab5cba.obscpio ->
openSUSE-release-tools-20210921.009ead7b.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20210921.22ab5cba/.flake8
new/openSUSE-release-tools-20210921.009ead7b/.flake8
--- old/openSUSE-release-tools-20210921.22ab5cba/.flake8 2021-09-21
14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/.flake8 2021-09-21
15:26:45.000000000 +0200
@@ -1,4 +1,4 @@
[flake8]
exclude = abichecker
max-line-length = 100
-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
+ignore =
E501,F401,E128,E251,E201,E202,E302,E305,F841,E261,E712,E126,E711,E125,E123,E101,E124,E127,E701,E714,W504,E129,E741,E722,E731
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/ReviewBot.py
new/openSUSE-release-tools-20210921.009ead7b/ReviewBot.py
--- old/openSUSE-release-tools-20210921.22ab5cba/ReviewBot.py 2021-09-21
14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/ReviewBot.py 2021-09-21
15:26:45.000000000 +0200
@@ -51,7 +51,7 @@
self.lookup = {}
def get(self, project, package):
- if not project in self.lookup:
+ if project not in self.lookup:
self.load(project)
return self.lookup[project].get(package, None)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/abichecker/abichecker.py
new/openSUSE-release-tools-20210921.009ead7b/abichecker/abichecker.py
--- old/openSUSE-release-tools-20210921.22ab5cba/abichecker/abichecker.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/abichecker/abichecker.py
2021-09-21 15:26:45.000000000 +0200
@@ -658,7 +658,7 @@
]
self.logger.debug(cmd)
r = subprocess.Popen(cmd, close_fds=True, cwd=CACHEDIR).wait()
- if not r in (0, 1):
+ if r not in (0, 1):
self.logger.error('abi-compliance-checker failed')
# XXX: record error
return None
@@ -706,7 +706,7 @@
for fn in fetchlist:
self.logger.debug("extract %s"%fn)
with open(tmpfile, 'wb') as tmpfd:
- if not fn in downloaded:
+ if fn not in downloaded:
raise FetchError("%s was not downloaded!"%fn)
self.logger.debug(downloaded[fn])
r = subprocess.call(['rpm2cpio', downloaded[fn]],
stdout=tmpfd, close_fds=True)
@@ -721,7 +721,7 @@
if fn.startswith('./'): # rpm payload is relative
fn = fn[1:]
self.logger.debug("cpio fn %s", fn)
- if not fn in liblist and not fn in debugfiles:
+ if fn not in liblist and fn not in debugfiles:
continue
dst = os.path.join(UNPACKDIR, project, package, repo,
arch)
dst += fn
@@ -745,7 +745,7 @@
def download_files(self, project, package, repo, arch, filenames, mtimes):
downloaded = dict()
for fn in filenames:
- if not fn in mtimes:
+ if fn not in mtimes:
raise FetchError("missing mtime information for %s, can't
check"% fn)
repodir = os.path.join(DOWNLOADS, package, project, repo)
if not os.path.exists(repodir):
@@ -885,7 +885,7 @@
arch = [ mr.arch for mr in matchrepos])
for result in results:
for res, _ in osc.core.result_xml_to_dicts(result):
- if not 'package' in res or res['package'] !=
src_srcinfo.package:
+ if 'package' not in res or res['package'] !=
src_srcinfo.package:
continue
rmap[(res['repository'], res['arch'])] = res
@@ -1032,7 +1032,7 @@
# check whether debug info exists for each lib
for pkgname in sorted(lib_packages.keys()):
dpkgname = pkgname+'-debuginfo'
- if not dpkgname in pkgs:
+ if dpkgname not in pkgs:
missing_debuginfo.add((prj, pkg, repo, arch, pkgname))
continue
@@ -1042,7 +1042,7 @@
ok = True
for lib in lib_packages[pkgname]:
libdebug = '/usr/lib/debug%s.debug'%lib
- if not libdebug in files:
+ if libdebug not in files:
# some new format that includes version, release and arch
in debuginfo?
# FIXME: version and release are actually the
# one from the main package, sub packages may
@@ -1054,7 +1054,7 @@
arch = 'i386'
libdebug = '/usr/lib/debug%s-%s-%s.%s.debug'%(lib,
h['version'].decode('utf-8'),
h['release'].decode('utf-8'), arch)
- if not libdebug in files:
+ if libdebug not in files:
missing_debuginfo.add((prj, pkg, repo, arch, pkgname,
lib))
ok = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/biarchtool.py
new/openSUSE-release-tools-20210921.009ead7b/biarchtool.py
--- old/openSUSE-release-tools-20210921.22ab5cba/biarchtool.py 2021-09-21
14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/biarchtool.py 2021-09-21
15:26:45.000000000 +0200
@@ -143,7 +143,7 @@
self.packages = self.meta_get_packagelist(self.project)
elif packages == '__latest__':
# only works when called in packagelists loop
- #self.packages =
self._filter_packages_by_time(self.latest_packages(self.project))
+ # self.packages =
self._filter_packages_by_time(self.latest_packages(self.project))
self.packages = self.latest_packages(self.project)
else:
self.packages = packages
@@ -185,7 +185,7 @@
changed = False
logger.debug("processing %s", pkg)
- if not pkg in self.package_metas:
+ if pkg not in self.package_metas:
logger.error("%s not found", pkg)
continue
pkgmeta = self.package_metas[pkg]
@@ -217,7 +217,7 @@
changed = False
logger.debug("processing %s", pkg)
- if not pkg in self.package_metas:
+ if pkg not in self.package_metas:
logger.error("%s not found", pkg)
continue
pkgmeta = self.package_metas[pkg]
@@ -250,7 +250,7 @@
todo = dict()
for pkg in self.packages:
logger.debug("processing %s", pkg)
- if not pkg in self.package_metas:
+ if pkg not in self.package_metas:
logger.error("%s not found", pkg)
continue
pkgmeta = self.package_metas[pkg]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/build-fail-reminder.py
new/openSUSE-release-tools-20210921.009ead7b/build-fail-reminder.py
--- old/openSUSE-release-tools-20210921.22ab5cba/build-fail-reminder.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/build-fail-reminder.py
2021-09-21 15:26:45.000000000 +0200
@@ -165,7 +165,7 @@
maintainers = set([p.get('name') for p in
root.findall('.//person') if p.get('role') in ('maintainer', 'bugowner')])
# TODO: expand groups if no persons found
for userid in maintainers:
- if not userid in Person:
+ if userid not in Person:
Person[userid] = osc.core.get_user_data(apiurl, userid,
'login', 'realname', 'email')
if Reminded[package].remindCount in (1, 2):
for userid in maintainers:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/check_maintenance_incidents.py
new/openSUSE-release-tools-20210921.009ead7b/check_maintenance_incidents.py
--- old/openSUSE-release-tools-20210921.22ab5cba/check_maintenance_incidents.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/check_maintenance_incidents.py
2021-09-21 15:26:45.000000000 +0200
@@ -86,7 +86,7 @@
mapping = MaintenanceChecker._get_lookup_yml(self.apiurl, project)
if mapping is None:
self.logger.error("error loading mapping for
{}".format(project))
- elif not pkgname in mapping:
+ elif pkgname not in mapping:
self.logger.debug("{} not tracked".format(pkgname))
else:
origin = mapping[pkgname]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/dashboard/generate.py
new/openSUSE-release-tools-20210921.009ead7b/dashboard/generate.py
--- old/openSUSE-release-tools-20210921.22ab5cba/dashboard/generate.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/dashboard/generate.py
2021-09-21 15:26:45.000000000 +0200
@@ -89,7 +89,6 @@
unresolvable += count
continue
building += count
- #print(code, file=sys.stderr)
# let's count them as building
if building > 0:
building += unresolvable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/dist/ci/docker-compose.yml
new/openSUSE-release-tools-20210921.009ead7b/dist/ci/docker-compose.yml
--- old/openSUSE-release-tools-20210921.22ab5cba/dist/ci/docker-compose.yml
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/dist/ci/docker-compose.yml
2021-09-21 15:26:45.000000000 +0200
@@ -1,7 +1,7 @@
version: "3.4"
x-obs: &obs
- image:
registry.opensuse.org/opensuse/tools/images/containers151/osrt_miniobs:latest
+ image:
registry.opensuse.org/opensuse/tools/images/containers153/osrt_miniobs:latest
x-testenv: &testenv
image:
registry.opensuse.org/opensuse/tools/images/containers_tumbleweed/osrt_testenv_tumbleweed:latest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/factory-package-news/factory-package-news-web.py
new/openSUSE-release-tools-20210921.009ead7b/factory-package-news/factory-package-news-web.py
---
old/openSUSE-release-tools-20210921.22ab5cba/factory-package-news/factory-package-news-web.py
2021-09-21 14:40:25.000000000 +0200
+++
new/openSUSE-release-tools-20210921.009ead7b/factory-package-news/factory-package-news-web.py
2021-09-21 15:26:45.000000000 +0200
@@ -41,7 +41,7 @@
_dir = get_dir(request.url_root)
fn = os.path.join(_dir, 'current')
if request.method == 'POST':
- if not 'version' in request.form:
+ if 'version' not in request.form:
return "missing version", 400
version = request.form['version']
if not digits_re.match(version):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/factory-package-news/factory-package-news.py
new/openSUSE-release-tools-20210921.009ead7b/factory-package-news/factory-package-news.py
---
old/openSUSE-release-tools-20210921.22ab5cba/factory-package-news/factory-package-news.py
2021-09-21 14:40:25.000000000 +0200
+++
new/openSUSE-release-tools-20210921.009ead7b/factory-package-news/factory-package-news.py
2021-09-21 15:26:45.000000000 +0200
@@ -222,7 +222,7 @@
details = ''
for srpm in sorted(group.keys()):
srpm1 = v1pkgs[group[srpm][0]]['sourcerpm']
- #print group[srpm], srpm, srpm1
+ # print group[srpm], srpm, srpm1
if srpm1 == srpm:
continue # source package unchanged
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/fcc_submitter.py
new/openSUSE-release-tools-20210921.009ead7b/fcc_submitter.py
--- old/openSUSE-release-tools-20210921.22ab5cba/fcc_submitter.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/fcc_submitter.py
2021-09-21 15:26:45.000000000 +0200
@@ -183,7 +183,7 @@
f = osc.core.show_prj_results_meta(self.apiurl, project)
root = ET.fromstringlist(f)
- #print ET.dump(root)
+ # print ET.dump(root)
failed_multibuild_pacs = []
pacs = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/gocd/notify-obs_rsync.py
new/openSUSE-release-tools-20210921.009ead7b/gocd/notify-obs_rsync.py
--- old/openSUSE-release-tools-20210921.22ab5cba/gocd/notify-obs_rsync.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/gocd/notify-obs_rsync.py
2021-09-21 15:26:45.000000000 +0200
@@ -62,6 +62,6 @@
openqa = OpenQA_Client(server=args.openqa)
for state in glob.glob('{}/*.yaml'.format(args.repos)):
state = basename(state).replace('.yaml', '')
- if not state in interesting_repos:
+ if state not in interesting_repos:
continue
notify_project(openqa, state)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/gocd/pkglistgen.opensuse.gocd.yaml
new/openSUSE-release-tools-20210921.009ead7b/gocd/pkglistgen.opensuse.gocd.yaml
---
old/openSUSE-release-tools-20210921.22ab5cba/gocd/pkglistgen.opensuse.gocd.yaml
2021-09-21 14:40:25.000000000 +0200
+++
new/openSUSE-release-tools-20210921.009ead7b/gocd/pkglistgen.opensuse.gocd.yaml
2021-09-21 15:26:45.000000000 +0200
@@ -20,37 +20,37 @@
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory -s target
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
openSUSE_Factory_rings:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory -s rings
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
openSUSE_Factory_ARM_target:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:ARM -s target
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s target
openSUSE_Factory_ARM_rings:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:ARM -s rings
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s rings
openSUSE_Factory_PowerPC:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:PowerPC
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC
openSUSE_Factory_zSystems:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:zSystems
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems
openSUSE_Factory_RISCV:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:RISCV
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:RISCV
Update.Repos.Factory:
group: Factory.pkglistgen
lock_behavior: unlockWhenFinished
@@ -71,22 +71,22 @@
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory
+ - script: python3 -u ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory
openSUSE_Factory_ARM:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
+ - script: python3 -u ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
openSUSE_Factory_PowerPC:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC
+ - script: python3 -u ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC
openSUSE_Factory_RISCV:
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:RISCV
+ - script: python3 -u ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:RISCV
Pkglistgen.openSUSE_Leap_15.4:
group: Leap.pkglistgen
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/gocd/pkglistgen.opensuse.gocd.yaml.erb
new/openSUSE-release-tools-20210921.009ead7b/gocd/pkglistgen.opensuse.gocd.yaml.erb
---
old/openSUSE-release-tools-20210921.22ab5cba/gocd/pkglistgen.opensuse.gocd.yaml.erb
2021-09-21 14:40:25.000000000 +0200
+++
new/openSUSE-release-tools-20210921.009ead7b/gocd/pkglistgen.opensuse.gocd.yaml.erb
2021-09-21 15:26:45.000000000 +0200
@@ -28,7 +28,7 @@
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p <%= project[0] %><%= options %>
+ - script: python3 -u ./pkglistgen.py -d -A
https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
<% end -%>
Update.Repos.Factory:
group: Factory.pkglistgen
@@ -51,7 +51,7 @@
resources:
- repo-checker
tasks:
- - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos <%= project %>
+ - script: python3 -u ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos <%= project %>
<% end -%>
Pkglistgen.openSUSE_Leap_15.4:
group: Leap.pkglistgen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/gocd/report-status.py
new/openSUSE-release-tools-20210921.009ead7b/gocd/report-status.py
--- old/openSUSE-release-tools-20210921.22ab5cba/gocd/report-status.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/gocd/report-status.py
2021-09-21 15:26:45.000000000 +0200
@@ -86,7 +86,7 @@
args = parser.parse_args()
# Configure OSC
osc.conf.get_config(override_apiurl=args.apiurl)
- #osc.conf.config['debug'] = 1
+ # osc.conf.config['debug'] = 1
architectures = sorted(target_archs(args.apiurl, args.project,
args.repository))
for arch in architectures:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20210921.22ab5cba/leaper.py
new/openSUSE-release-tools-20210921.009ead7b/leaper.py
--- old/openSUSE-release-tools-20210921.22ab5cba/leaper.py 2021-09-21
14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/leaper.py 2021-09-21
15:26:45.000000000 +0200
@@ -75,7 +75,7 @@
return packages
def is_package_in_project(self, project, package):
- if not project in self.packages:
+ if project not in self.packages:
self.packages[project] = self.get_source_packages(project)
return True if package in self.packages[project] else False
@@ -285,7 +285,7 @@
# TODO #1662: Uncomment once maintbot has been superseded and
leaper
# is no longer run in comment-only mode.
- #self.do_check_maintainer_review = True
+ # self.do_check_maintainer_review = True
return None
elif self.action.type == 'maintenance_incident':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/legal-auto.py
new/openSUSE-release-tools-20210921.009ead7b/legal-auto.py
--- old/openSUSE-release-tools-20210921.22ab5cba/legal-auto.py 2021-09-21
14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/legal-auto.py 2021-09-21
15:26:45.000000000 +0200
@@ -76,7 +76,7 @@
url = osc.core.makeurl(self.legaldb, ['packages'], params)
package = REQ.post(url, headers=self.legaldb_headers).json()
- if not 'saved' in package:
+ if 'saved' not in package:
return None
package = package['saved']
url = osc.core.makeurl(self.legaldb, ['requests'], {'external_link':
self.request_nick(),
@@ -130,7 +130,7 @@
if not self.dryrun:
REQ.patch(url, headers=self.legaldb_headers)
continue
- if not state in ['acceptable', 'correct', 'unacceptable']:
+ if state not in ['acceptable', 'correct', 'unacceptable']:
return None
if state == 'unacceptable':
user = report.get('reviewing_user', None)
@@ -282,7 +282,7 @@
obj = REQ.post(url, headers=self.legaldb_headers).json()
except HTTPError:
return None
- if not 'saved' in obj:
+ if 'saved' not in obj:
return None
legaldb_id = obj['saved']['id']
self.logger.debug("PKG {}/{}[{}]->{} is {}".format(sproject, package,
revision, tproject, legaldb_id))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/manager_42.py
new/openSUSE-release-tools-20210921.009ead7b/manager_42.py
--- old/openSUSE-release-tools-20210921.22ab5cba/manager_42.py 2021-09-21
14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/manager_42.py 2021-09-21
15:26:45.000000000 +0200
@@ -245,7 +245,7 @@
self._fill_package_list(project)
- if not deleted and not package in self.packages[project]:
+ if not deleted and package not in self.packages[project]:
return None, None
his = self.get_package_history(project, package, deleted)
@@ -273,7 +273,7 @@
def check_one_package(self, package):
self.sle_workarounds_sourced = False
lproject = self.lookup.get(package, None)
- if not package in self.packages[self.config.from_prj]:
+ if package not in self.packages[self.config.from_prj]:
if not self._is_ignored(package):
logger.info("{} vanished".format(package))
if self.lookup.get(package):
@@ -308,7 +308,7 @@
root.get('verifymd5'))
if srcmd5:
lstring = 'Devel;{};{}'.format(develprj, develpkg)
- if not package in self.lookup or lstring !=
self.lookup[package]:
+ if package not in self.lookup or lstring !=
self.lookup[package]:
logger.debug("{} from devel {}/{} (was
{})".format(package, develprj, develpkg, lproject))
self.lookup[package] = lstring
self.lookup_changes += 1
@@ -323,7 +323,7 @@
# if it's from Factory we check if the package can be found
elsewhere meanwhile
if not self.force and lproject != self.config.factory:
return
- elif lproject == self.config.factory and not package in
self.packages[lproject]:
+ elif lproject == self.config.factory and package not in
self.packages[lproject]:
his = self.get_package_history(lproject, package, deleted=True)
if his:
logger.debug("{} got dropped from {}".format(package,
lproject))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/osclib/PubSubConsumer.py
new/openSUSE-release-tools-20210921.009ead7b/osclib/PubSubConsumer.py
--- old/openSUSE-release-tools-20210921.22ab5cba/osclib/PubSubConsumer.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/osclib/PubSubConsumer.py
2021-09-21 15:26:45.000000000 +0200
@@ -378,7 +378,7 @@
self.logger.debug('Stopping')
if self._consuming:
self.stop_consuming()
- #self._connection.ioloop.start()
+ # self._connection.ioloop.start()
else:
self._connection.ioloop.stop()
self.logger.debug('Stopped')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/osclib/cleanup_rings.py
new/openSUSE-release-tools-20210921.009ead7b/osclib/cleanup_rings.py
--- old/openSUSE-release-tools-20210921.22ab5cba/osclib/cleanup_rings.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/osclib/cleanup_rings.py
2021-09-21 15:26:45.000000000 +0200
@@ -8,7 +8,7 @@
try:
from urllib.error import HTTPError
except ImportError:
- #python 2.x
+ # python 2.x
from urllib2 import HTTPError
class CleanupRings(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/osclib/core.py
new/openSUSE-release-tools-20210921.009ead7b/osclib/core.py
--- old/openSUSE-release-tools-20210921.22ab5cba/osclib/core.py 2021-09-21
14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/osclib/core.py 2021-09-21
15:26:45.000000000 +0200
@@ -932,7 +932,7 @@
xpath = '({})'.format(xpath)
- if not 'all' in states:
+ if 'all' not in states:
xpath_states = ''
for state in states:
xpath_states = xpath_join(xpath_states,
'state/@name="{}"'.format(state), inner=True)
@@ -960,7 +960,7 @@
xpath = xpath_join(xpath,
'action/source/@package="{}"'.format(package_repository), op='and', inner=True)
xpath = '({})'.format(xpath)
- if not 'all' in states:
+ if 'all' not in states:
xpath_states = ''
for state in states:
xpath_states = xpath_join(xpath_states,
'state/@name="{}"'.format(state), inner=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/osclib/repochecks.py
new/openSUSE-release-tools-20210921.009ead7b/osclib/repochecks.py
--- old/openSUSE-release-tools-20210921.22ab5cba/osclib/repochecks.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/osclib/repochecks.py
2021-09-21 15:26:45.000000000 +0200
@@ -120,7 +120,7 @@
if match:
package = match.group(1)
in_problem = False
- if not package in target_packages:
+ if package not in target_packages:
continue
if package in whitelist:
logger.debug("{} fails installcheck but is white
listed".format(package))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/pkglistgen/group.py
new/openSUSE-release-tools-20210921.009ead7b/pkglistgen/group.py
--- old/openSUSE-release-tools-20210921.22ab5cba/pkglistgen/group.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/pkglistgen/group.py
2021-09-21 15:26:45.000000000 +0200
@@ -52,7 +52,7 @@
for a in archs:
# we use groups.yml for powerpc through a branch,
# so ignore inapplicable architectures
- if not a in self.packages: continue
+ if a not in self.packages: continue
self.packages[a].append([package, self.name])
def parse_yml(self, packages):
@@ -106,7 +106,7 @@
for p in s:
self.solved_packages[arch].pop(p, None)
for p in without.not_found.keys():
- if not p in self.not_found:
+ if p not in self.not_found:
continue
self.not_found[p] -= without.not_found[p]
if not self.not_found[p]:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/pkglistgen/tool.py
new/openSUSE-release-tools-20210921.009ead7b/pkglistgen/tool.py
--- old/openSUSE-release-tools-20210921.22ab5cba/pkglistgen/tool.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/pkglistgen/tool.py
2021-09-21 15:26:45.000000000 +0200
@@ -161,12 +161,12 @@
for i in importants:
group = self.groups[i]
for arch in group.packages:
- if not arch in g.solved_packages:
+ if arch not in g.solved_packages:
continue
for package in group.packages[arch]:
if package[0] in g.solved_packages[arch]:
continue
- if not package[0] in g.solved_packages['*']:
+ if package[0] not in g.solved_packages['*']:
self.logger.error(f'Missing {package[0]} in
{groupname} for {arch}')
def expand_repos(self, project, repo='standard'):
@@ -431,15 +431,17 @@
pool.createwhatprovides()
- for s in oldsysrepo.solvables_iter():
- if s.arch == 'src':
- continue
+ accepted_archs = set(self.all_architectures)
+ accepted_archs.add('noarch')
+ for s in oldsysrepo.solvables_iter():
oldarch = s.arch
if oldarch == 'i686':
oldarch = 'i586'
- #print('check', s.name, oldarch)
+ if oldarch not in accepted_archs:
+ continue
+
haveit = False
for s2 in pool.whatprovides(s.nameid):
if s2.repo == oldsysrepo or s.nameid != s2.nameid:
@@ -463,7 +465,8 @@
break
if haveit:
continue
- drops.setdefault(s.name, {'repo': key, 'archs': set()})
+ if s.name not in drops:
+ drops[s.name] = {'repo': key, 'archs': set()}
if oldarch == 'noarch':
drops[s.name]['archs'] |= set(self.all_architectures)
else:
@@ -478,7 +481,7 @@
for name in sorted(drops):
if drops[name]['repo'] != repo:
continue
- if len(drops[name]['archs']) == len(self.all_architectures):
+ if drops[name]['archs'] == set(self.all_architectures):
if not repo_output:
print('#', repo, file=output)
repo_output = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/pkglistgen/update_repo_handler.py
new/openSUSE-release-tools-20210921.009ead7b/pkglistgen/update_repo_handler.py
---
old/openSUSE-release-tools-20210921.22ab5cba/pkglistgen/update_repo_handler.py
2021-09-21 14:40:25.000000000 +0200
+++
new/openSUSE-release-tools-20210921.009ead7b/pkglistgen/update_repo_handler.py
2021-09-21 15:26:45.000000000 +0200
@@ -166,7 +166,7 @@
key = '{}/{}'.format(s.name, s.arch)
if present.get(key, {}).get(s.evr):
continue
- elif not key in present:
+ elif key not in present:
print('# NEW', s.name, s.arch, file=packages_file)
evr = s.evr.split('-')
release = evr.pop()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/project-installcheck.py
new/openSUSE-release-tools-20210921.009ead7b/project-installcheck.py
--- old/openSUSE-release-tools-20210921.22ab5cba/project-installcheck.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/project-installcheck.py
2021-09-21 15:26:45.000000000 +0200
@@ -236,7 +236,7 @@
# calculate build info hashes
for package in packages:
- if not package in succeeding:
+ if package not in succeeding:
self.logger.debug("Ignore %s for the moment, not succeeding",
package)
continue
m = hashlib.sha256()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/sync-rebuild.py
new/openSUSE-release-tools-20210921.009ead7b/sync-rebuild.py
--- old/openSUSE-release-tools-20210921.22ab5cba/sync-rebuild.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/sync-rebuild.py
2021-09-21 15:26:45.000000000 +0200
@@ -15,7 +15,7 @@
pkg = ""
projects = ['openSUSE:Factory', 'openSUSE:Factory:Rebuild']
-#initialize osc config
+# initialize osc config
osc.conf.get_config()
def get_prj_results(prj, arch):
@@ -61,7 +61,6 @@
def rebuild_pkg_in_factory(package, prj, arch, testmode, code=None):
query = { 'cmd': 'rebuild', 'arch': arch }
- #prj = "home:jzwickl"
if package:
query['package'] = package
pkg = query['package']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/tests/OBSLocal.py
new/openSUSE-release-tools-20210921.009ead7b/tests/OBSLocal.py
--- old/openSUSE-release-tools-20210921.22ab5cba/tests/OBSLocal.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/tests/OBSLocal.py
2021-09-21 15:26:45.000000000 +0200
@@ -351,9 +351,9 @@
def create_attribute_type(self, namespace, name, values=None):
"""Creates a new attribute type in the OBS instance."""
- if not namespace in self.attr_types: self.attr_types[namespace] = []
+ if namespace not in self.attr_types: self.attr_types[namespace] = []
- if not name in self.attr_types[namespace]:
self.attr_types[namespace].append(name)
+ if name not in self.attr_types[namespace]:
self.attr_types[namespace].append(name)
meta = """
<namespace name='{}'>
@@ -429,7 +429,7 @@
ET.SubElement(persons, 'person', {'userid': user} )
meta = ET.tostring(root)
- if not name in self.groups:
+ if name not in self.groups:
self.groups.append(name)
url = osc.core.makeurl(APIURL, ['group', name])
osc.core.http_PUT(url, data=meta)
@@ -685,7 +685,7 @@
def create_staging(self, suffix, freeze=False, rings=None,
with_repo=False):
staging_key = 'staging:{}'.format(suffix)
# do not reattach if already present
- if not staging_key in self.projects:
+ if staging_key not in self.projects:
staging_name = self.project + ':Staging:' + suffix
staging = Project(staging_name, create=False, with_repo=with_repo)
url = osc.core.makeurl(APIURL, ['staging', self.project,
'staging_projects'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20210921.22ab5cba/update_crawler.py
new/openSUSE-release-tools-20210921.009ead7b/update_crawler.py
--- old/openSUSE-release-tools-20210921.22ab5cba/update_crawler.py
2021-09-21 14:40:25.000000000 +0200
+++ new/openSUSE-release-tools-20210921.009ead7b/update_crawler.py
2021-09-21 15:26:45.000000000 +0200
@@ -206,7 +206,7 @@
['source', prj, '00Meta', 'lookup.yml']))
def follow_link(self, project, package, rev, verifymd5):
- #print "follow", project, package, rev
+ # print "follow", project, package, rev
# verify it's still the same package
xml = ET.fromstring(self._get_source_package(project, package, rev))
if xml.get('verifymd5') != verifymd5:
@@ -245,12 +245,12 @@
if origin.startswith('Devel;'):
(dummy, origin, dummy) = origin.split(';')
- if self.filter_lookup and not origin in self.filter_lookup:
+ if self.filter_lookup and origin not in self.filter_lookup:
if not origin.startswith('subpackage of'):
self.skipped.setdefault(origin, set()).add(package)
continue
- if not package in targets:
+ if package not in targets:
if not self.submit_new:
logging.info('Package %s not found in targets' % (package))
continue
@@ -272,7 +272,7 @@
md5_from = sourceinfo.get('verifymd5')
md5_to = targetinfo.get('verifymd5')
if md5_from == md5_to:
- #logging.info('Package %s not marked for update' % package)
+ # logging.info('Package %s not marked for update' %
package)
continue
if self.is_source_innerlink(self.to_prj, package):
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.dUfW98/_old 2021-09-22 22:13:08.872332538 +0200
+++ /var/tmp/diff_new_pack.dUfW98/_new 2021-09-22 22:13:08.876332541 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20210921.22ab5cba
-mtime: 1632228025
-commit: 22ab5cbac3d41ea32c3179a90fbc50e28c4984fa
+version: 20210921.009ead7b
+mtime: 1632230805
+commit: 009ead7be35c96674e19b81eea08612ae19f5e8a
