Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-01-13 21:47:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Sat Jan 13 21:47:12 2018 rev:40 rq:563504 version:20180110.9ab0211
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-01-10 23:37:12.662271906 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-01-13 21:47:14.563207026 +0100
@@ -1,0 +2,36 @@
+Thu Jan 11 04:20:00 UTC 2018 - [email protected]
+
+- Update to version 20180110.9ab0211:
+ * obs_clone: workaround openSUSE:Factory meta revision 429 self reference.
+ * obs_clone: set the exit code to 1 when HTTPError encountered.
+
+-------------------------------------------------------------------
+Wed Jan 10 22:16:47 UTC 2018 - [email protected]
+
+- Update to version 20180110.453674c:
+ * pkglistgen: typo locals vs locales
+ * pkglistgen: add correct staging DVD repo
+ * pkglistgen: use xdg.BaseDirectory
+
+-------------------------------------------------------------------
+Tue Jan 09 23:40:41 UTC 2018 - [email protected]
+
+- Update to version 20180109.29108bd:
+ * pkglistgen: do_update_and_solve: staging correct :DVD subproject append.
+ * pkglistgen: first pass __file__ through realpath due to packaging symlink.
+ * dist/spec: move pkglistgen.py under subpackage ownership.
+ * dist/spec: add python-requests requirement were applicable.
+
+-------------------------------------------------------------------
+Tue Jan 09 22:33:15 UTC 2018 - [email protected]
+
+- Update to version 20180109.09a98cd:
+ * osclib/conf: intial SLE configuration for pkglistgen.
+ * pkglistgen: update_and_solve: include step in output for debugging.
+ * pkglistgen: update_and_solve: handle --dry for undelete_package().
+ * pkglistgen: update_and_solve: include ignore_unresolvable and local
options for solve.
+ * pkglistgen: update_and_solve: set input_dir to group_dir for solve.
+ * osclib/conf: correct Leap 15.0 default locales-from from - to . product.
+ * systemd/pkglistgen: add update_and_solve subcommand.
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180109.2b037a0.obscpio
New:
----
openSUSE-release-tools-20180110.9ab0211.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.3V7SbP/_old 2018-01-13 21:47:17.579066430 +0100
+++ /var/tmp/diff_new_pack.3V7SbP/_new 2018-01-13 21:47:17.583066244 +0100
@@ -20,7 +20,7 @@
%define source_dir osc-plugin-factory
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180109.2b037a0
+Version: 20180110.9ab0211
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0+ and MIT
@@ -60,9 +60,11 @@
Requires: python-cmdln
Requires: python-colorama
Requires: python-lxml
+# issue-diff.py, legal-auto.py, and openqa-maintenance.py
Requires: python-pycurl
Requires: python-python-dateutil
Requires: python-pyxdg
+Requires: python-requests
Requires: python-urlgrabber
# bs_mirrorfull
@@ -203,6 +205,7 @@
BuildArch: noarch
Requires: obs-service-product_converter
Requires: osclib = %{version}
+Requires: python-requests
Requires: python-solv
# we use the same user as repo-checker
PreReq: openSUSE-release-tools-repo-checker
@@ -368,6 +371,7 @@
%exclude %{_datadir}/%{source_dir}/manager_42.py
%exclude %{_datadir}/%{source_dir}/metrics
%exclude %{_datadir}/%{source_dir}/metrics.py
+%exclude %{_datadir}/%{source_dir}/pkglistgen.py
%exclude %{_datadir}/%{source_dir}/repo_checker.pl
%exclude %{_datadir}/%{source_dir}/repo_checker.py
%exclude %{_datadir}/%{source_dir}/suppkg_rebuild.py
@@ -483,6 +487,7 @@
%files pkglistgen
%defattr(-,root,root,-)
%{_bindir}/osrt-pkglistgen
+%{_datadir}/%{source_dir}/pkglistgen.py
%{_unitdir}/[email protected]
%{_unitdir}/[email protected]
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.3V7SbP/_old 2018-01-13 21:47:17.631064007 +0100
+++ /var/tmp/diff_new_pack.3V7SbP/_new 2018-01-13 21:47:17.631064007 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/osc-plugin-factory.git</param>
- <param
name="changesrevision">61c83500d3ca8a21b772fc1100437411a8643a71</param>
+ <param
name="changesrevision">ecda2f03031e7bfc29f7d628c646f1940878c774</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180109.2b037a0.obscpio ->
openSUSE-release-tools-20180110.9ab0211.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180109.2b037a0/dist/package/openSUSE-release-tools.spec
new/openSUSE-release-tools-20180110.9ab0211/dist/package/openSUSE-release-tools.spec
---
old/openSUSE-release-tools-20180109.2b037a0/dist/package/openSUSE-release-tools.spec
2018-01-09 23:12:11.000000000 +0100
+++
new/openSUSE-release-tools-20180110.9ab0211/dist/package/openSUSE-release-tools.spec
2018-01-11 05:13:58.000000000 +0100
@@ -60,6 +60,8 @@
Requires: python-cmdln
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
@@ -203,6 +205,7 @@
BuildArch: noarch
Requires: osclib = %{version}
Requires: obs-service-product_converter
+Requires: python-requests
Requires: python-solv
# we use the same user as repo-checker
PreReq: openSUSE-release-tools-repo-checker
@@ -368,6 +371,7 @@
%exclude %{_datadir}/%{source_dir}/manager_42.py
%exclude %{_datadir}/%{source_dir}/metrics
%exclude %{_datadir}/%{source_dir}/metrics.py
+%exclude %{_datadir}/%{source_dir}/pkglistgen.py
%exclude %{_datadir}/%{source_dir}/repo_checker.pl
%exclude %{_datadir}/%{source_dir}/repo_checker.py
%exclude %{_datadir}/%{source_dir}/suppkg_rebuild.py
@@ -483,6 +487,7 @@
%files pkglistgen
%defattr(-,root,root,-)
%{_bindir}/osrt-pkglistgen
+%{_datadir}/%{source_dir}/pkglistgen.py
%{_unitdir}/[email protected]
%{_unitdir}/[email protected]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180109.2b037a0/obs_clone.py
new/openSUSE-release-tools-20180110.9ab0211/obs_clone.py
--- old/openSUSE-release-tools-20180109.2b037a0/obs_clone.py 2018-01-09
23:12:11.000000000 +0100
+++ new/openSUSE-release-tools-20180110.9ab0211/obs_clone.py 2018-01-11
05:13:58.000000000 +0100
@@ -84,6 +84,7 @@
# - write real
def project_clone(apiurl_source, apiurl_target, project):
users_clone(apiurl_source, apiurl_target, project)
+ project_workaround(project)
# Write stripped version that does not include repos with path references.
url = makeurl(apiurl_target, ['source', project.get('name'), '_meta'])
@@ -102,6 +103,13 @@
path = ['source', target.get('project'), '_meta']
entity_clone(apiurl_source, apiurl_target, path,
clone=project_clone)
+def project_workaround(project):
+ if project.get('name') == 'openSUSE:Factory':
+ # TODO #1335: temporary scariness from from revision 429.
+ scariness =
project.xpath('repository[@name="standard"]/path[contains(@project,
":0-Bootstrap")]')
+ if len(scariness):
+ scariness[0].getparent().remove(scariness[0])
+
def package_clone(apiurl_source, apiurl_target, package):
# Clone project that contains the package.
path = ['source', package.get('project'), '_meta']
@@ -154,6 +162,7 @@
except HTTPError as e:
# Print full output for any errors since message can be cryptic.
print(e.read())
+ return 1
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Clone projects and
dependencies between OBS instances.')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180109.2b037a0/osclib/conf.py
new/openSUSE-release-tools-20180110.9ab0211/osclib/conf.py
--- old/openSUSE-release-tools-20180109.2b037a0/osclib/conf.py 2018-01-09
23:12:11.000000000 +0100
+++ new/openSUSE-release-tools-20180110.9ab0211/osclib/conf.py 2018-01-11
05:13:58.000000000 +0100
@@ -72,7 +72,7 @@
'repo-checker': 'repo-checker',
'pkglistgen-archs': 'x86_64',
'pkglistgen-archs-ports': 'aarch64',
- 'pkglistgen-locals-from': 'openSUSE-product',
+ 'pkglistgen-locales-from': 'openSUSE.product',
'pkglistgen-include-suggested': '1',
'pkglistgen-delete-kiwis': 'openSUSE-ftp-ftp-x86_64.kiwi
openSUSE-cd-mini-x86_64.kiwi',
},
@@ -92,6 +92,9 @@
'main-repo': 'standard',
# check_source.py
'repo-checker': 'repo-checker',
+ 'pkglistgen-archs': 'x86_64',
+ 'pkglistgen-ignore-unresolvable': '1',
+ 'pkglistgen-ignore-recommended': '1',
},
r'SUSE:(?P<project>.*$)': {
'staging': 'SUSE:%(project)s:Staging',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180109.2b037a0/pkglistgen.py
new/openSUSE-release-tools-20180110.9ab0211/pkglistgen.py
--- old/openSUSE-release-tools-20180109.2b037a0/pkglistgen.py 2018-01-09
23:12:11.000000000 +0100
+++ new/openSUSE-release-tools-20180110.9ab0211/pkglistgen.py 2018-01-11
05:13:58.000000000 +0100
@@ -40,6 +40,7 @@
from osc import conf
from osclib.conf import Config
from osclib.stagingapi import StagingAPI
+from xdg.BaseDirectory import save_cache_path
import glob
import solv
from pprint import pprint, pformat
@@ -63,6 +64,7 @@
logger = logging.getLogger()
+SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))
ARCHITECTURES = ['x86_64', 'ppc64le', 's390x', 'aarch64']
DEFAULT_REPOS = ("openSUSE:Factory/standard")
PRODUCT_SERVICE = '/usr/lib/obs/service/create_single_product'
@@ -717,7 +719,7 @@
"""
# only there to parse the repos
- bs_mirrorfull = os.path.join(os.path.dirname(__file__),
'bs_mirrorfull')
+ bs_mirrorfull = os.path.join(SCRIPT_PATH, 'bs_mirrorfull')
global_update = False
for prp in self.tool.repos:
project, repo = prp.split('/')
@@ -1011,15 +1013,18 @@
# DVD project first since it depends on main.
if api.rings:
opts_dvd = copy.deepcopy(opts)
- opts.project += ':DVD'
- self.options.repos.insert(0, '/'.join([opts.project,
main_repo]))
+ opts_dvd.project += ':DVD'
+ self.options.repos.insert(0, '/'.join([opts_dvd.project,
main_repo]))
self.update_and_solve_target(apiurl, target_project,
target_config, main_repo, opts_dvd, skip_release=True)
+ self.options.repos.pop(0)
self.update_and_solve_target(apiurl, target_project,
target_config, main_repo, opts)
return
def update_and_solve_target(self, apiurl, target_project, target_config,
main_repo, opts,
skip_release=False):
+ print('[{}] {}/{}: update and solve'.format(opts.scope, opts.project,
main_repo))
+
group = target_config.get('pkglistgen-group', '000package-groups')
product = target_config.get('pkglistgen-product', '000product')
release = target_config.get('pkglistgen-release',
'000release-packages')
@@ -1027,7 +1032,8 @@
url = makeurl(apiurl, ['source', opts.project])
packages = ET.parse(http_GET(url)).getroot()
if packages.find('entry[@name="{}"]'.format(product)) is None:
- undelete_package(apiurl, opts.project, product, 'revive')
+ if not self.options.dry:
+ undelete_package(apiurl, opts.project, product, 'revive')
# TODO disable build.
print('{} undeleted, skip dvd until next cycle'.format(product))
return
@@ -1043,14 +1049,14 @@
checkout_list.append(release)
if packages.find('entry[@name="{}"]'.format(release)) is None:
- undelete_package(apiurl, opts.project, product, 'revive')
+ if not self.options.dry:
+ undelete_package(apiurl, opts.project, product, 'revive')
print('{} undeleted, skip dvd until next
cycle'.format(release))
return
# Cache dir specific to hostname and project.
host = urlparse.urlparse(apiurl).hostname
- cache_dir = os.environ.get('XDG_CACHE_HOME',
os.path.expanduser('~/.cache'))
- cache_dir = os.path.join(cache_dir, 'opensuse-packagelists', host,
opts.project)
+ cache_dir = save_cache_path('opensuse-packagelists', host,
opts.project)
if os.path.exists(cache_dir):
shutil.rmtree(cache_dir)
@@ -1070,19 +1076,25 @@
['supportstatus.txt', 'groups.yml',
'package-groups.changes'])
self.change_extension(product_dir, '.spec.in', '.spec')
+ self.options.input_dir = group_dir
self.options.output_dir = product_dir
self.postoptparse()
+ print('-> do_update')
self.do_update('update', opts)
- opts.ignore_recommended =
bool(target_config.get('pkglistgen-include-recommended'))
+ print('-> do_solve')
+ opts.ignore_unresolvable =
bool(target_config.get('pkglistgen-ignore-unresolvable'))
+ opts.ignore_recommended =
bool(target_config.get('pkglistgen-ignore-recommended'))
opts.include_suggested =
bool(target_config.get('pkglistgen-include-suggested'))
- opts.locales_from = target_config.get('pkglistgen-locals-from')
+ opts.locale = target_config.get('pkglistgen-local')
+ opts.locales_from = target_config.get('pkglistgen-locales-from')
self.do_solve('solve', opts)
delete_products = target_config.get('pkglistgen-delete-products',
'').split(' ')
self.unlink_list(product_dir, delete_products)
+ print('-> product service')
for product_file in glob.glob(os.path.join(product_dir, '*.product')):
print(subprocess.check_output(
[PRODUCT_SERVICE, product_file, product_dir, opts.project]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180109.2b037a0/systemd/[email protected]
new/openSUSE-release-tools-20180110.9ab0211/systemd/[email protected]
---
old/openSUSE-release-tools-20180109.2b037a0/systemd/[email protected]
2018-01-09 23:12:11.000000000 +0100
+++
new/openSUSE-release-tools-20180110.9ab0211/systemd/[email protected]
2018-01-11 05:13:58.000000000 +0100
@@ -3,7 +3,7 @@
[Service]
User=osrt-repo-checker
-ExecStart=/usr/bin/osrt-pkglistgen -p "%i"
+ExecStart=/usr/bin/osrt-pkglistgen update_and_solve -p "%i"
[Install]
WantedBy=multi-user.target
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.3V7SbP/_old 2018-01-13 21:47:18.479024475 +0100
+++ /var/tmp/diff_new_pack.3V7SbP/_new 2018-01-13 21:47:18.483024289 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180109.2b037a0
-mtime: 1515535931
-commit: 2b037a0b81785cb07643773266c70df03d209710
+version: 20180110.9ab0211
+mtime: 1515644038
+commit: 9ab0211e27d223add45e503348fdf8b8b4fde5fe
