Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-03-28 10:34:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Mar 28 10:34:19 2018 rev:73 rq:591765 version:20180326.b4c885d
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-03-19 23:38:42.852626105 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-03-28 10:34:24.962497023 +0200
@@ -1,0 +2,22 @@
+Mon Mar 26 09:25:39 UTC 2018 - [email protected]
+
+- Update to version 20180326.b4c885d:
+ * totest_manager: Also release openSUSE:Leap:15.0:Images/opensuse-leap-image
+ * totest-manager: Tumbleweed moved to the new product builder
+
+-------------------------------------------------------------------
+Fri Mar 23 10:29:31 UTC 2018 - [email protected]
+
+- Update to version 20180323.5d0c024:
+ * leaper: allow comment override also on openSUSE
+ * Add create_sle_weakremovers command
+
+-------------------------------------------------------------------
+Mon Mar 19 16:37:52 UTC 2018 - [email protected]
+
+- Update to version 20180319.133d87b:
+ * Change references to osc-plugin-factory to openSUSE-release-tools.
+ * check_source: make use of ReviewBot request_default_return.
+ * check_source_in_factory: allow repo-checker reviews.
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180317.88a6e97.obscpio
New:
----
openSUSE-release-tools-20180326.b4c885d.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.X1Mvj1/_old 2018-03-28 10:34:26.282449548 +0200
+++ /var/tmp/diff_new_pack.X1Mvj1/_new 2018-03-28 10:34:26.290449260 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openSUSE-release-tools
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,15 @@
%global __provides_exclude ^perl.*
-%define source_dir osc-plugin-factory
+%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180317.88a6e97
+Version: 20180326.b4c885d
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
Group: Development/Tools/Other
-Url: https://github.com/openSUSE/osc-plugin-factory
+Url: https://github.com/openSUSE/openSUSE-release-tools
Source: %{name}-%{version}.tar.xz
BuildArch: noarch
# Requires sr#512849 which provides osc_plugin_dir.
@@ -61,15 +61,15 @@
Requires: python-colorama
Requires: python-lxml
# issue-diff.py, legal-auto.py, and openqa-maintenance.py
+Requires: python-requests
Requires: python-pycurl
Requires: python-python-dateutil
Requires: python-pyxdg
-Requires: python-requests
Requires: python-urlgrabber
# bs_mirrorfull
-Requires: perl-Net-SSLeay
Requires: perl-XML-Parser
+Requires: perl-Net-SSLeay
# Spec related requirements.
Requires: osclib = %{version}
@@ -167,8 +167,8 @@
# TODO Update requirements.
Requires: osclib = %{version}
# repo_checker.pl
-Requires: build
Requires: perl-XML-Simple
+Requires: build
Requires(pre): shadow
%description repo-checker
@@ -203,8 +203,8 @@
Summary: Generates package lists in 000product
Group: Development/Tools/Other
BuildArch: noarch
-Requires: obs-service-product_converter
Requires: osclib = %{version}
+Requires: obs-service-product_converter
Requires: python-requests
Requires: python-solv
# we use the same user as repo-checker
@@ -272,7 +272,7 @@
%check
%if 0%{?is_opensuse}
-# TODO openSUSE/osc-plugin-factory#1221: decide how to handle integration tests
+# TODO openSUSE/openSUSE-release-tools#1221: decide how to handle integration
tests
# make check
%endif
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.X1Mvj1/_old 2018-03-28 10:34:26.378446095 +0200
+++ /var/tmp/diff_new_pack.X1Mvj1/_new 2018-03-28 10:34:26.386445807 +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">42139de4d68490f8128cfae6451a21d8e9f2db5d</param>
+ <param
name="changesrevision">b4c885d265146819536555c6b602185136562149</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180317.88a6e97.obscpio ->
openSUSE-release-tools-20180326.b4c885d.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180317.88a6e97/.travis.yml
new/openSUSE-release-tools-20180326.b4c885d/.travis.yml
--- old/openSUSE-release-tools-20180317.88a6e97/.travis.yml 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/.travis.yml 2018-03-26
11:21:57.000000000 +0200
@@ -84,7 +84,7 @@
cache:
directories:
# obs_clone.py
- - ~/.cache/osc-plugin-factory-clone
+ - ~/.cache/openSUSE-release-tools-clone
# distribution jobs `osc build`
- .docker-tmp
pip: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/Makefile.common
new/openSUSE-release-tools-20180326.b4c885d/Makefile.common
--- old/openSUSE-release-tools-20180317.88a6e97/Makefile.common 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/Makefile.common 2018-03-26
11:21:57.000000000 +0200
@@ -4,7 +4,7 @@
datadir=$(prefix)/share
sysconfdir=/etc
unitdir=$(prefix)/lib/systemd/system
-pkgdatadir=$(datadir)/osc-plugin-factory
+pkgdatadir=$(datadir)/openSUSE-release-tools
grafana_provisioning_dir="$(sysconfdir)/grafana/provisioning"
oscplugindir=$(prefix)/lib/osc-plugins
apachevhostsdir=$(sysconfdir)/apache2/vhosts.d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/README.asciidoc
new/openSUSE-release-tools-20180326.b4c885d/README.asciidoc
--- old/openSUSE-release-tools-20180317.88a6e97/README.asciidoc 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/README.asciidoc 2018-03-26
11:21:57.000000000 +0200
@@ -1,7 +1,7 @@
Factory workflow plugins
========================
-image:https://travis-ci.org/openSUSE/osc-plugin-factory.png?branch=master["Build
Status", link="https://travis-ci.org/openSUSE/osc-plugin-factory";]
image:https://coveralls.io/repos/openSUSE/osc-plugin-factory/badge.png?branch=master["Coverage
Status", link="https://coveralls.io/r/openSUSE/osc-plugin-factory";]
+image:https://travis-ci.org/openSUSE/openSUSE-release-tools.png?branch=master["Build
Status", link="https://travis-ci.org/openSUSE/openSUSE-release-tools";]
image:https://coveralls.io/repos/openSUSE/osc-plugin-factory/badge.png?branch=master["Coverage
Status", link="https://coveralls.io/r/openSUSE/osc-plugin-factory";]
This repository contains various OSC plugins and scripts used for the
maintenance of openSUSE distributions like Factory.
@@ -41,7 +41,7 @@
Clone this repository:
-------------------------------------------------------------------------------
-git clone https://github.com/openSUSE/osc-plugin-factory.git
+git clone https://github.com/openSUSE/openSUSE-release-tools.git
-------------------------------------------------------------------------------
Create links for the different plugins that you want to install in
@@ -49,7 +49,7 @@
the staging plugin:
-------------------------------------------------------------------------------
-cd osc-plugin-factory
+cd openSUSE-release-tools
ln -sr ./osc-staging.py ./osclib ~/.osc-plugins
-------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/abichecker/apache/opensuse-abi-checker.conf.in
new/openSUSE-release-tools-20180326.b4c885d/abichecker/apache/opensuse-abi-checker.conf.in
---
old/openSUSE-release-tools-20180317.88a6e97/abichecker/apache/opensuse-abi-checker.conf.in
2018-03-17 07:10:11.000000000 +0100
+++
new/openSUSE-release-tools-20180326.b4c885d/abichecker/apache/opensuse-abi-checker.conf.in
2018-03-26 11:21:57.000000000 +0200
@@ -1,12 +1,12 @@
<VirtualHost *:80>
ServerName abichecker.suse.de
- WSGIDaemonProcess opensuse-abi-checker user=_opensuse.org-abi-checker
group=nogroup display-name=%{GROUP}
home=/usr/share/osc-plugin-factory/abichecker
+ WSGIDaemonProcess opensuse-abi-checker user=_opensuse.org-abi-checker
group=nogroup display-name=%{GROUP}
home=/usr/share/openSUSE-release-tools/abichecker
WSGIProcessGroup opensuse-abi-checker
- WSGIScriptAlias /
/usr/share/osc-plugin-factory/abichecker/abichecker-web.py
+ WSGIScriptAlias /
/usr/share/openSUSE-release-tools/abichecker/abichecker-web.py
- <Directory "/usr/share/osc-plugin-factory/abichecker">
+ <Directory "/usr/share/openSUSE-release-tools/abichecker">
<Files abichecker-web.py>
<IfModule !mod_access_compat.c>
Require all granted
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/abichecker/systemd/opensuse-abi-checker.service
new/openSUSE-release-tools-20180326.b4c885d/abichecker/systemd/opensuse-abi-checker.service
---
old/openSUSE-release-tools-20180317.88a6e97/abichecker/systemd/opensuse-abi-checker.service
2018-03-17 07:10:11.000000000 +0100
+++
new/openSUSE-release-tools-20180326.b4c885d/abichecker/systemd/opensuse-abi-checker.service
2018-03-26 11:21:57.000000000 +0200
@@ -3,7 +3,7 @@
[Service]
Type=forking
-ExecStart=/usr/bin/tmux new-session -P -d -s abichecker -n bot
/usr/share/osc-plugin-factory/abichecker/abichecker.py --no-review --verbose -A
https://api.suse.de --web-url=http://abichecker.suse.de project --interval 15
SUSE:Maintenance maintenance_incident
+ExecStart=/usr/bin/tmux new-session -P -d -s abichecker -n bot
/usr/share/openSUSE-release-tools/abichecker/abichecker.py --no-review
--verbose -A https://api.suse.de --web-url=http://abichecker.suse.de project
--interval 15 SUSE:Maintenance maintenance_incident
ExecStop=/usr/bin/tmux kill-session -t abichecker
-WorkingDirectory=/usr/share/osc-plugin-factory/abichecker
+WorkingDirectory=/usr/share/openSUSE-release-tools/abichecker
User=_opensuse.org-abi-checker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/check_source.py
new/openSUSE-release-tools-20180326.b4c885d/check_source.py
--- old/openSUSE-release-tools-20180317.88a6e97/check_source.py 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/check_source.py 2018-03-26
11:21:57.000000000 +0200
@@ -28,6 +28,7 @@
# ReviewBot options.
self.only_one_action = True
+ self.request_default_return = True
self.maintbot = MaintenanceChecker(*args, **kwargs)
@@ -276,10 +277,6 @@
self.review_messages['declined'] = "This is an incorrect request,
it's a linked package to %s/%s" % (linked_project, linked_package)
return False
- def check_action__default(self, request, action):
- self.review_messages['accepted'] = 'Unhandled request type %s.' %
(action.type)
- return True
-
class CommandLineInterface(ReviewBot.CommandLineInterface):
def __init__(self, *args, **kwargs):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/check_source_in_factory.py
new/openSUSE-release-tools-20180326.b4c885d/check_source_in_factory.py
--- old/openSUSE-release-tools-20180317.88a6e97/check_source_in_factory.py
2018-03-17 07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/check_source_in_factory.py
2018-03-26 11:21:57.000000000 +0200
@@ -181,9 +181,15 @@
self.logger.error("%s in state review but no
reviews?", srref(req.reqid))
return False
for r in req.reviews:
- if r.by_project and r.state == 'new' and
r.by_project.startswith('openSUSE:Factory:Staging:'):
- self.logger.info("%s review by %s ok",
srref(req.reqid), r.by_project)
- continue
+ if r.state == 'new':
+ if r.by_project and
r.by_project.startswith('openSUSE:Factory:Staging:'):
+ self.logger.info("%s review by %s ok",
srref(req.reqid), r.by_project)
+ continue
+
+ if r.by_user == 'repo-checker':
+ self.logger.info('%s review by %s ok',
srref(req.reqid), r.by_user)
+ continue
+
if r.state != 'accepted':
if r.by_user:
self.logger.info("%s waiting for review by
%s", srref(req.reqid), r.by_user)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/dist/package/openSUSE-release-tools.spec
new/openSUSE-release-tools-20180326.b4c885d/dist/package/openSUSE-release-tools.spec
---
old/openSUSE-release-tools-20180317.88a6e97/dist/package/openSUSE-release-tools.spec
2018-03-17 07:10:11.000000000 +0100
+++
new/openSUSE-release-tools-20180326.b4c885d/dist/package/openSUSE-release-tools.spec
2018-03-26 11:21:57.000000000 +0200
@@ -17,7 +17,7 @@
%global __provides_exclude ^perl.*
-%define source_dir osc-plugin-factory
+%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
Version: 0
@@ -25,7 +25,7 @@
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0+ AND MIT
Group: Development/Tools/Other
-Url: https://github.com/openSUSE/osc-plugin-factory
+Url: https://github.com/openSUSE/openSUSE-release-tools
Source: %{name}-%{version}.tar.xz
BuildArch: noarch
# Requires sr#512849 which provides osc_plugin_dir.
@@ -272,7 +272,7 @@
%check
%if 0%{?is_opensuse}
-# TODO openSUSE/osc-plugin-factory#1221: decide how to handle integration tests
+# TODO openSUSE/openSUSE-release-tools#1221: decide how to handle integration
tests
# make check
%endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/docs/check_source.asciidoc
new/openSUSE-release-tools-20180326.b4c885d/docs/check_source.asciidoc
--- old/openSUSE-release-tools-20180317.88a6e97/docs/check_source.asciidoc
2018-03-17 07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/docs/check_source.asciidoc
2018-03-26 11:21:57.000000000 +0200
@@ -22,13 +22,13 @@
Clone this repository:
-------------------------------------------------------------------------------
-git clone https://github.com/openSUSE/osc-plugin-factory.git
+git clone https://github.com/openSUSE/openSUSE-release-tools.git
-------------------------------------------------------------------------------
Link the plugin and the library in +~/.osc-plugins+ or +/var/lib/osc-plugins+.
-------------------------------------------------------------------------------
-cd osc-plugin-factory
+cd openSUSE-release-tools
ln -sr ./osc-check_source.py ./osclib ~/.osc-plugins
-------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/docs/checkdups.asciidoc
new/openSUSE-release-tools-20180326.b4c885d/docs/checkdups.asciidoc
--- old/openSUSE-release-tools-20180317.88a6e97/docs/checkdups.asciidoc
2018-03-17 07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/docs/checkdups.asciidoc
2018-03-26 11:21:57.000000000 +0200
@@ -18,13 +18,13 @@
Clone this repository:
-------------------------------------------------------------------------------
-git clone https://github.com/openSUSE/osc-plugin-factory.git
+git clone https://github.com/openSUSE/openSUSE-release-tools.git
-------------------------------------------------------------------------------
Link the plugin and the library in +~/.osc-plugins+ or +/var/lib/osc-plugins+.
-------------------------------------------------------------------------------
-cd osc-plugin-factory
+cd openSUSE-release-tools
ln -sr ./osc-check_dups.py ./osclib ~/.osc-plugins
-------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/docs/metrics.md
new/openSUSE-release-tools-20180326.b4c885d/docs/metrics.md
--- old/openSUSE-release-tools-20180317.88a6e97/docs/metrics.md 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/docs/metrics.md 2018-03-26
11:21:57.000000000 +0200
@@ -46,7 +46,7 @@
by saving the dashboard with different defaults.
Use the `--debug` option and inspect individual request XML dumps by looking in
-`~/.cache/osc-plugin-factory-metrics` or:
+`~/.cache/openSUSE-release-tools-metrics` or:
```
osc api '/request/$reqid?withfullhistory=1'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/docs/staging.asciidoc
new/openSUSE-release-tools-20180326.b4c885d/docs/staging.asciidoc
--- old/openSUSE-release-tools-20180317.88a6e97/docs/staging.asciidoc
2018-03-17 07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/docs/staging.asciidoc
2018-03-26 11:21:57.000000000 +0200
@@ -39,14 +39,14 @@
Clone this repository:
--------------------------------------------------------------------------------
-git clone https://github.com/openSUSE/osc-plugin-factory.git
+git clone https://github.com/openSUSE/openSUSE-release-tools.git
--------------------------------------------------------------------------------
Link +osc-staging.py+ and the library either to +~/.osc-plugins+ or
+/var/lib/osc-plugins+
--------------------------------------------------------------------------------
-cd osc-plugin-factory
+cd openSUSE-release-tools
ln -sr ./osc-staging.py ./osclib ~/.osc-plugins
--------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/docs/totest.asciidoc
new/openSUSE-release-tools-20180326.b4c885d/docs/totest.asciidoc
--- old/openSUSE-release-tools-20180317.88a6e97/docs/totest.asciidoc
2018-03-17 07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/docs/totest.asciidoc
2018-03-26 11:21:57.000000000 +0200
@@ -33,13 +33,13 @@
Clone this repository:
-------------------------------------------------------------------------------
-git clone https://github.com/openSUSE/osc-plugin-factory.git
+git clone https://github.com/openSUSE/openSUSE-release-tools.git
-------------------------------------------------------------------------------
Link the plugin and the library in +~/.osc-plugins+ or +/var/lib/osc-plugins+.
-------------------------------------------------------------------------------
-cd osc-plugin-factory
+cd openSUSE-release-tools
ln -sr ./osc-totest.py ./osclib ~/.osc-plugins
-------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/factory-package-news/apache/factory-package-news.conf
new/openSUSE-release-tools-20180326.b4c885d/factory-package-news/apache/factory-package-news.conf
---
old/openSUSE-release-tools-20180317.88a6e97/factory-package-news/apache/factory-package-news.conf
2018-03-17 07:10:11.000000000 +0100
+++
new/openSUSE-release-tools-20180326.b4c885d/factory-package-news/apache/factory-package-news.conf
2018-03-26 11:21:57.000000000 +0200
@@ -1,9 +1,9 @@
WSGIDaemonProcess factory-package-news user=_factory-news group=nogroup
display-name=%{GROUP}
WSGIProcessGroup factory-package-news
-WSGIScriptAlias /factory-package-news
/usr/share/osc-plugin-factory/factory-package-news/factory-package-news-web.py
+WSGIScriptAlias /factory-package-news
/usr/share/openSUSE-release-tools/factory-package-news/factory-package-news-web.py
-<Directory /usr/share/osc-plugin-factory/factory-package-news>
+<Directory /usr/share/openSUSE-release-tools/factory-package-news>
<Files factory-package-news-web.py>
Order allow,deny
Allow from all
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/issue-diff.py
new/openSUSE-release-tools-20180326.b4c885d/issue-diff.py
--- old/openSUSE-release-tools-20180317.88a6e97/issue-diff.py 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/issue-diff.py 2018-03-26
11:21:57.000000000 +0200
@@ -241,7 +241,7 @@
Cache.init()
- git_repo_url =
'[email protected]:jberry-suse/osc-plugin-factory-issue-db.git'
+ git_repo_url =
'[email protected]:jberry-suse/openSUSE-release-tools-issue-db.git'
git_message = 'Sync issue-diff.py changes.'
db_dir = sync(args.cache_dir, git_repo_url, git_message)
db_file = os.path.join(db_dir, '{}.yml'.format(args.project))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180317.88a6e97/leaper.py
new/openSUSE-release-tools-20180326.b4c885d/leaper.py
--- old/openSUSE-release-tools-20180317.88a6e97/leaper.py 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/leaper.py 2018-03-26
11:21:57.000000000 +0200
@@ -243,8 +243,7 @@
self.source_in_factory = True
# no need to approve submissions from Factory if
# the lookup file points to Factory. Just causes
- # spam for many maintainers
- #
https://github.com/openSUSE/osc-plugin-factory/issues/1393
+ # spam for many maintainers #1393
self.do_check_maintainer_review = False
is_fine_if_factory = True
# fall through to check history and requests
@@ -404,6 +403,13 @@
self.needs_legal_review = True
return True
+ if self.override_allow:
+ # Rather than decline, leave review open and ask release
+ # manager for input via override comment.
+ self.logger.info('Comment `(at){} override accept` to force
accept.'.format(self.review_user))
+ self.needs_release_manager = True
+ return None
+
return False
def _check_factory(self, target_package, src_srcinfo,
target_project='openSUSE:Factory'):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180317.88a6e97/metrics.py
new/openSUSE-release-tools-20180326.b4c885d/metrics.py
--- old/openSUSE-release-tools-20180317.88a6e97/metrics.py 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/metrics.py 2018-03-26
11:21:57.000000000 +0200
@@ -362,7 +362,7 @@
return
# Use separate cache since it is persistent.
- Cache.CACHE_DIR = os.path.expanduser('~/.cache/osc-plugin-factory-metrics')
+ Cache.CACHE_DIR = Cache.CACHE_DIR + '-metrics'
if args.wipe_cache:
Cache.delete_all()
Cache.PATTERNS['/search/request'] = sys.maxint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/osclib/cache.py
new/openSUSE-release-tools-20180326.b4c885d/osclib/cache.py
--- old/openSUSE-release-tools-20180317.88a6e97/osclib/cache.py 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/osclib/cache.py 2018-03-26
11:21:57.000000000 +0200
@@ -64,7 +64,7 @@
cache, but obviously not for other contributors.
"""
- CACHE_DIR = os.path.expanduser('~/.cache/osc-plugin-factory')
+ CACHE_DIR = os.path.expanduser('~/.cache/openSUSE-release-tools')
TTL_LONG = 12 * 60 * 60
TTL_MEDIUM = 30 * 60
TTL_SHORT = 5 * 60
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/osclib/git.py
new/openSUSE-release-tools-20180326.b4c885d/osclib/git.py
--- old/openSUSE-release-tools-20180317.88a6e97/osclib/git.py 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/osclib/git.py 2018-03-26
11:21:57.000000000 +0200
@@ -3,7 +3,7 @@
import subprocess
from xdg.BaseDirectory import save_cache_path
-CACHE_DIR = save_cache_path('osc-plugin-factory', 'git')
+CACHE_DIR = save_cache_path('openSUSE-release-tools', 'git')
def clone(url, directory):
return_code = subprocess.call(['git', 'clone', url, directory])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/pkglistgen.py
new/openSUSE-release-tools-20180326.b4c885d/pkglistgen.py
--- old/openSUSE-release-tools-20180317.88a6e97/pkglistgen.py 2018-03-17
07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/pkglistgen.py 2018-03-26
11:21:57.000000000 +0200
@@ -774,7 +774,7 @@
self.solv_merge(solv_file_merged, solv_file, solv_file_nonfree)
def solv_merge(self, solv_merged, *solvs):
- solvs = list(solvs) # From tuple.
+ solvs = list(solvs) # From tuple.
if os.path.exists(solv_merged):
modified = map(os.path.getmtime, [solv_merged] + solvs)
@@ -790,6 +790,66 @@
if p.returncode:
raise Exception('failed to create merged solv file')
+ def do_create_sle_weakremovers(self, subcmd, opts, *prjs):
+ for prj in prjs:
+ logger.debug("processing %s", prj)
+ self.options.repos = ['/'.join([prj, 'standard'])]
+ self.postoptparse()
+ opts.project = prj
+ self.do_update('update', opts)
+
+ drops = dict()
+ for arch in self.tool.architectures:
+ pool = solv.Pool()
+ pool.setarch(arch)
+
+ sysrepo = None
+ for prp in prjs:
+ fn = os.path.join(CACHEDIR, 'repo-{}-{}-{}.solv'.format(prp,
'standard', arch))
+ r = pool.add_repo(prp)
+ r.add_solv(fn)
+ if not sysrepo:
+ sysrepo = r
+
+ pool.createwhatprovides()
+
+ for s in pool.solvables_iter():
+ if s.repo == sysrepo or not (s.arch == 'noarch' or s.arch ==
arch):
+ continue
+ haveit = False
+ for s2 in pool.whatprovides(s.nameid):
+ if s2.repo == sysrepo and s.nameid == s2.nameid:
+ haveit = True
+ if haveit:
+ continue
+ nevr = pool.rel2id(s.nameid, s.evrid, solv.REL_EQ)
+ for s2 in pool.whatmatchesdep(solv.SOLVABLE_OBSOLETES, nevr):
+ if s2.repo == sysrepo:
+ continue
+ haveit = True
+ if haveit:
+ continue
+ if s.name not in drops:
+ drops[s.name] = {'repo': s.repo.name, 'archs': []}
+ if arch not in drops[s.name]['archs']:
+ drops[s.name]['archs'].append(arch)
+ for prp in prjs:
+ exclusives = dict()
+ print('#', prp)
+ for name in sorted(drops.keys()):
+ if drops[name]['repo'] != prp:
+ continue
+ if len(drops[name]['archs']) == len(self.tool.architectures):
+ print('Provides: weakremover({})'.format(name))
+ else:
+ jarch = ' '.join(sorted(drops[name]['archs']))
+ exclusives.setdefault(jarch, []).append(name)
+ for arch in sorted(exclusives.keys()):
+ print('%ifarch {}'.format(arch))
+ for name in sorted(exclusives[arch]):
+ print('Provides: weakremover({})'.format(name))
+ print('%endif')
+
def do_create_droplist(self, subcmd, opts, *oldsolv):
"""${cmd_name}: generate list of obsolete packages
@@ -935,7 +995,7 @@
if name is not None:
# Only update file if overwrite or different.
- ofh.flush() # Ensure entirely written before comparing.
+ ofh.flush() # Ensure entirely written before comparing.
if not opts.overwrite and os.path.exists(name) and
filecmp.cmp(name + '.new', name, shallow=False):
logger.debug('file identical, skip dumping')
os.remove(name + '.new')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180317.88a6e97/totest-manager.py
new/openSUSE-release-tools-20180326.b4c885d/totest-manager.py
--- old/openSUSE-release-tools-20180317.88a6e97/totest-manager.py
2018-03-17 07:10:11.000000000 +0100
+++ new/openSUSE-release-tools-20180326.b4c885d/totest-manager.py
2018-03-26 11:21:57.000000000 +0200
@@ -100,7 +100,7 @@
def get_current_snapshot(self):
"""Return the current snapshot in the test project"""
- for binary in self.binaries_of_product(self.test_project,
'_product:%s-cd-mini-%s' % (self.project_base, self.arch())):
+ for binary in self.binaries_of_product(self.test_project,
'000product:%s-cd-mini-%s' % (self.project_base, self.arch())):
result = re.match(r'%s-%s-NET-.*-Snapshot(.*)-Media.iso' %
(self.project_base, self.iso_prefix()),
binary)
if result:
@@ -128,7 +128,7 @@
def release_version(self):
url = self.api.makeurl(['build', self.project, 'standard', self.arch(),
- '_product:%s-release' % self.project_base])
+ '000product:%s-release' % self.project_base])
f = self.api.retried_GET(url)
root = ET.parse(f).getroot()
for binary in root.findall('binary'):
@@ -617,14 +617,14 @@
class ToTestFactory(ToTestBase):
- main_products = ['_product:openSUSE-dvd5-dvd-i586',
- '_product:openSUSE-dvd5-dvd-x86_64',
- '_product:openSUSE-cd-mini-i586',
- '_product:openSUSE-cd-mini-x86_64',
- '_product:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64']
+ main_products = ['000product:openSUSE-dvd5-dvd-i586',
+ '000product:openSUSE-dvd5-dvd-x86_64',
+ '000product:openSUSE-cd-mini-i586',
+ '000product:openSUSE-cd-mini-x86_64',
+ '000product:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64']
- ftp_products = ['_product:openSUSE-ftp-ftp-i586_x86_64',
- '_product:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64']
+ ftp_products = ['000product:openSUSE-ftp-ftp-i586_x86_64',
+ '000product:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64']
livecd_products = ['livecd-tumbleweed-kde',
'livecd-tumbleweed-gnome',
@@ -644,12 +644,12 @@
class ToTestFactoryPowerPC(ToTestBase):
- main_products = ['_product:openSUSE-dvd5-dvd-ppc64',
- '_product:openSUSE-dvd5-dvd-ppc64le',
- '_product:openSUSE-cd-mini-ppc64',
- '_product:openSUSE-cd-mini-ppc64le']
+ main_products = ['000product:openSUSE-dvd5-dvd-ppc64',
+ '000product:openSUSE-dvd5-dvd-ppc64le',
+ '000product:openSUSE-cd-mini-ppc64',
+ '000product:openSUSE-cd-mini-ppc64le']
- ftp_products = ['_product:openSUSE-ftp-ftp-ppc64_ppc64le']
+ ftp_products = ['000product:openSUSE-ftp-ftp-ppc64_ppc64le']
livecd_products = []
@@ -694,10 +694,10 @@
class ToTestFactoryARM(ToTestFactory):
- main_products = ['_product:openSUSE-cd-mini-aarch64',
- '_product:openSUSE-dvd5-dvd-aarch64']
+ main_products = ['000product:openSUSE-cd-mini-aarch64',
+ '000product:openSUSE-dvd5-dvd-aarch64']
- ftp_products = ['_product:openSUSE-ftp-ftp-aarch64']
+ ftp_products = ['000product:openSUSE-ftp-ftp-aarch64']
livecd_products = []
@@ -756,6 +756,7 @@
'livecd-leap-gnome',
'livecd-leap-kde',
'livecd-leap-x11',
+ 'opensuse-leap-image',
]
ftp_products = []
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.X1Mvj1/_old 2018-03-28 10:34:27.578402936 +0200
+++ /var/tmp/diff_new_pack.X1Mvj1/_new 2018-03-28 10:34:27.578402936 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180317.88a6e97
-mtime: 1521267011
-commit: 88a6e975f549f0c9ad4093d063cf62f31f0308e9
+version: 20180326.b4c885d
+mtime: 1522056117
+commit: b4c885d265146819536555c6b602185136562149
![https://travis-ci.org/openSUSE/osc-plugin-factory.png?branch=master["Build](https://travis-ci.org/openSUSE/osc-plugin-factory.png?branch=master["Build){kind=link}
![https://coveralls.io/repos/openSUSE/osc-plugin-factory/badge.png?branch=master["Coverage](https://coveralls.io/repos/openSUSE/osc-plugin-factory/badge.png?branch=master["Coverage){kind=link}
![https://travis-ci.org/openSUSE/openSUSE-release-tools.png?branch=master["Build](https://travis-ci.org/openSUSE/openSUSE-release-tools.png?branch=master["Build){kind=link}