Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-12-07 15:09:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Sat Dec 7 15:09:50 2019 rev:259 rq:754862 version:20191206.7faf8118
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-12-06 15:06:32.816368731 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.4691/openSUSE-release-tools.changes
2019-12-07 15:10:28.547837583 +0100
@@ -1,0 +2,7 @@
+Fri Dec 06 13:54:39 UTC 2019 - [email protected]
+
+- Update to version 20191206.7faf8118:
+ * Have staging accept without argument take all green
+ * Adopt help text for adi and accept
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20191206.8f62f42c.obscpio
New:
----
openSUSE-release-tools-20191206.7faf8118.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.mg5VVs/_old 2019-12-07 15:10:34.091836798 +0100
+++ /var/tmp/diff_new_pack.mg5VVs/_new 2019-12-07 15:10:34.095836797 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20191206.8f62f42c
+Version: 20191206.7faf8118
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.mg5VVs/_old 2019-12-07 15:10:34.131836792 +0100
+++ /var/tmp/diff_new_pack.mg5VVs/_new 2019-12-07 15:10:34.131836792 +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">345321f98d1653df4059ddcb9d5e762ab8d3f99c</param>
+ <param
name="changesrevision">a7a7921c9461a0a0f6e7e50585ad70b3d8f0568e</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20191206.8f62f42c.obscpio ->
openSUSE-release-tools-20191206.7faf8118.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191206.8f62f42c/osc-staging.py
new/openSUSE-release-tools-20191206.7faf8118/osc-staging.py
--- old/openSUSE-release-tools-20191206.8f62f42c/osc-staging.py 2019-12-06
12:39:14.000000000 +0100
+++ new/openSUSE-release-tools-20191206.7faf8118/osc-staging.py 2019-12-06
14:53:09.000000000 +0100
@@ -124,16 +124,13 @@
${cmd_option_list}
- "accept" will accept all requests in
- $PROJECT:Staging:<LETTER> into $PROJECT
- If openSUSE:* project, requests marked ready from adi stagings will
also
- be accepted.
+ "accept" will accept all requests in the given stagings. Without argument,
+ it accepts all acceptable stagings.
"adi" will list already staged requests, stage new requests, and supersede
requests where applicable. New adi stagings will be created for new
packages based on the grouping options used. The default grouping is by
- source project. When adi stagings are ready the request will be marked
- ready, unstaged, and the adi staging deleted.
+ source project. When adi stagings are empty, they are deleted.
"check" will check if all packages are links without changes
@@ -295,7 +292,7 @@
A request list can be used to limit what is superseded.
Usage:
- osc staging accept [--force] [--no-cleanup] [LETTER...]
+ osc staging accept [--force] [--no-cleanup] [STAGING...]
osc staging adi [--move] [--by-develproject] [--split] [REQUEST...]
osc staging check [STAGING...]
osc staging check_duplicate_binaries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191206.8f62f42c/osclib/accept_command.py
new/openSUSE-release-tools-20191206.7faf8118/osclib/accept_command.py
--- old/openSUSE-release-tools-20191206.8f62f42c/osclib/accept_command.py
2019-12-06 12:39:14.000000000 +0100
+++ new/openSUSE-release-tools-20191206.7faf8118/osclib/accept_command.py
2019-12-06 14:53:09.000000000 +0100
@@ -66,16 +66,29 @@
msg="remove link while accepting delete of
{}".format(package))
def accept_all(self, projects, force=False, cleanup=True):
+ accept_all_green = len(projects) == 0
+ if accept_all_green:
+ print('Accepting all acceptable projects')
+ if force:
+ print('ERROR: Not compatible with force option')
+ return False
+
self.requests = { 'delete': [], 'submit': [] }
staging_packages = {}
+ if accept_all_green:
+ projects = self.api.get_staging_projects()
+
for prj in projects:
project = self.api.prj_from_letter(prj)
status = self.api.project_status(project)
- if status.get('state') != 'acceptable' and not force:
- print('The project "{}" is not yet
acceptable.'.format(project))
- return False
+ if status.get('state') != 'acceptable':
+ if accept_all_green:
+ continue
+ if not force:
+ print('The project "{}" is not yet
acceptable.'.format(project))
+ return False
staging_packages[project] = []
for request in status.findall('staged_requests/request'):
@@ -94,18 +107,15 @@
opts['force'] = '1'
print('triggering staging accepts...')
- for prj in projects:
- project = self.api.prj_from_letter(prj)
-
+ for project in staging_packages.keys():
u = self.api.makeurl(['staging', self.api.project,
'staging_projects', project, 'accept'], opts)
- f = http_POST(u)
+ http_POST(u)
for req in other_new:
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 prj in projects:
- project = self.api.prj_from_letter(prj)
+ for project in staging_packages.keys():
print(f'waiting for staging project {project} to be accepted')
while True:
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.mg5VVs/_old 2019-12-07 15:10:34.659836717 +0100
+++ /var/tmp/diff_new_pack.mg5VVs/_new 2019-12-07 15:10:34.659836717 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20191206.8f62f42c
-mtime: 1575632354
-commit: 8f62f42ca560fb0a374701a2c011ffd6da41d0fa
+version: 20191206.7faf8118
+mtime: 1575640389
+commit: 7faf81181e279a98498c7cd75084c0ef5c0d8587
