Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-08-03 12:37:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Fri Aug 3 12:37:05 2018 rev:116 rq:626924 version:20180801.174755e
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-07-28 12:45:11.220966456 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-08-03 12:37:15.055565037 +0200
@@ -1,0 +2,7 @@
+Wed Aug 01 14:30:49 UTC 2018 - [email protected]
+
+- Update to version 20180801.174755e:
+ * pkglistgen: Support passing multiple scopes
+ * Rename superseded_by_id to superseded_by
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180727.27f0056.obscpio
New:
----
openSUSE-release-tools-20180801.174755e.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.p9W3ZN/_old 2018-08-03 12:37:17.291568356 +0200
+++ /var/tmp/diff_new_pack.p9W3ZN/_new 2018-08-03 12:37:17.295568363 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180727.27f0056
+Version: 20180801.174755e
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.p9W3ZN/_old 2018-08-03 12:37:17.331568416 +0200
+++ /var/tmp/diff_new_pack.p9W3ZN/_new 2018-08-03 12:37:17.331568416 +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">60514b440412ef98a14ee537dffd2fe552d7bb9d</param>
+ <param
name="changesrevision">174755ed28b54395551c2e1c6560af12ae17a4fe</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180727.27f0056.obscpio ->
openSUSE-release-tools-20180801.174755e.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180727.27f0056/osclib/check_command.py
new/openSUSE-release-tools-20180801.174755e/osclib/check_command.py
--- old/openSUSE-release-tools-20180727.27f0056/osclib/check_command.py
2018-07-27 14:14:54.000000000 +0200
+++ new/openSUSE-release-tools-20180801.174755e/osclib/check_command.py
2018-08-01 15:47:29.000000000 +0200
@@ -35,7 +35,7 @@
report = []
# Check for superseded requests
- report.extend(' - Request %s is superseded by %s' % (r['number'],
r['superseded_by_id'])
+ report.extend(' - Request %s is superseded by %s' % (r['number'],
r['superseded_by'])
for r in project['obsolete_requests'] if r['state'] ==
'superseded')
# Untracked requests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180727.27f0056/pkglistgen.py
new/openSUSE-release-tools-20180801.174755e/pkglistgen.py
--- old/openSUSE-release-tools-20180727.27f0056/pkglistgen.py 2018-07-27
14:14:54.000000000 +0200
+++ new/openSUSE-release-tools-20180801.174755e/pkglistgen.py 2018-08-01
15:47:29.000000000 +0200
@@ -1123,7 +1123,7 @@
@cmdln.option('-f', '--force', action='store_true', help='continue even if
build is in progress')
@cmdln.option('-p', '--project', help='target project')
- @cmdln.option('-s', '--scope', default='all', help='scope on which to
operate ({}, staging:$letter)'.format(', '.join(SCOPES)))
+ @cmdln.option('-s', '--scope', action='append', default=['all'],
help='scope on which to operate ({}, staging:$letter)'.format(',
'.join(SCOPES)))
@cmdln.option('--no-checkout', action='store_true', help='reuse checkout
in cache')
@cmdln.option('--stop-after-solve', action='store_true', help='only create
group files')
def do_update_and_solve(self, subcmd, opts):
@@ -1138,20 +1138,24 @@
if not opts.project:
raise ValueError('project is required')
opts.staging_project = None
- if opts.scope.startswith('staging:'):
- opts.staging_project = re.match('staging:(.*)',
opts.scope).group(1)
- opts.staging_project = opts.staging_project.upper()
- opts.scope = 'staging'
-
- if opts.scope not in self.SCOPES:
- raise ValueError('scope must be one of: {}'.format(',
'.join(self.SCOPES)))
-
- if opts.scope == 'all':
- for scope in self.SCOPES[1:]:
- opts.scope = scope
- self.do_update_and_solve(subcmd, copy.deepcopy(opts))
- return self.error_occured
+ # special case for all
+ if opts.scope == ['all']:
+ opts.scope = self.SCOPES[1:]
+
+ for scope in opts.scope:
+ if scope.startswith('staging:'):
+ opts.staging_project = re.match('staging:(.*)', scope).group(1)
+ opts.staging_project = opts.staging_project.upper()
+ scope = 'staging'
+ if scope not in self.SCOPES:
+ raise ValueError('scope "{}" must be one of: {}'.format(scope,
', '.join(self.SCOPES)))
+ opts.scope = scope
+ self.real_update_and_solve(copy.deepcopy(opts))
+ return self.error_occured
+
+ # note: scope is a value here - while it's an array above
+ def real_update_and_solve(self, opts):
# Store target project as opts.project will contain subprojects.
target_project = opts.project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180727.27f0056/tests/fixtures/project/staging_projects/openSUSE:Factory.json
new/openSUSE-release-tools-20180801.174755e/tests/fixtures/project/staging_projects/openSUSE:Factory.json
---
old/openSUSE-release-tools-20180727.27f0056/tests/fixtures/project/staging_projects/openSUSE:Factory.json
2018-07-27 14:14:54.000000000 +0200
+++
new/openSUSE-release-tools-20180801.174755e/tests/fixtures/project/staging_projects/openSUSE:Factory.json
2018-08-01 15:47:29.000000000 +0200
@@ -1072,7 +1072,7 @@
"obsolete_requests": [
{
"accept_at": null,
- "superseded_by_id": null,
+ "superseded_by": null,
"description": "",
"creator": "alois",
"created_at": "2017-05-02T10:24:19.000Z",
@@ -1084,7 +1084,7 @@
},
{
"accept_at": null,
- "superseded_by_id": 492518,
+ "superseded_by": 492518,
"description": "",
"creator": "alois",
"created_at": "2017-05-02T10:24:19.000Z",
@@ -1096,7 +1096,7 @@
},
{
"accept_at": null,
- "superseded_by_id": 592518,
+ "superseded_by": 592518,
"description": "",
"creator": "alois",
"created_at": "2017-05-02T10:24:19.000Z",
@@ -1108,7 +1108,7 @@
},
{
"accept_at": null,
- "superseded_by_id": null,
+ "superseded_by": null,
"description": "",
"creator": "alois",
"created_at": "2017-05-02T10:24:19.000Z",
@@ -1120,7 +1120,7 @@
},
{
"accept_at": null,
- "superseded_by_id": null,
+ "superseded_by": null,
"description": "",
"creator": "leaper",
"created_at": "2017-05-02T10:24:19.000Z",
@@ -1132,7 +1132,7 @@
},
{
"accept_at": null,
- "superseded_by_id": null,
+ "superseded_by": null,
"description": "",
"creator": "alois",
"created_at": "2017-05-02T10:24:19.000Z",
@@ -1144,7 +1144,7 @@
},
{
"accept_at": null,
- "superseded_by_id": null,
+ "superseded_by": null,
"description": "",
"creator": "alois",
"created_at": "2017-05-02T10:24:19.000Z",
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.p9W3ZN/_old 2018-08-03 12:37:17.867569212 +0200
+++ /var/tmp/diff_new_pack.p9W3ZN/_new 2018-08-03 12:37:17.867569212 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180727.27f0056
-mtime: 1532693694
-commit: 27f0056e8d36d268e7a944776bac07acddf8d573
+version: 20180801.174755e
+mtime: 1533131249
+commit: 174755ed28b54395551c2e1c6560af12ae17a4fe
