Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-11-30 10:37:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Sat Nov 30 10:37:50 2019 rev:253 rq:751602 version:20191128.fe8e6c23
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-11-28 10:18:04.395639570 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.26869/openSUSE-release-tools.changes
2019-11-30 10:39:37.076156070 +0100
@@ -1,0 +2,6 @@
+Thu Nov 28 12:57:54 UTC 2019 - [email protected]
+
+- Update to version 20191128.fe8e6c23:
+ * check_source: query all repos if source info yields error
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20191127.ae1b6ea1.obscpio
New:
----
openSUSE-release-tools-20191128.fe8e6c23.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.7OcUfv/_old 2019-11-30 10:39:41.824155500 +0100
+++ /var/tmp/diff_new_pack.7OcUfv/_new 2019-11-30 10:39:41.828155500 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20191127.ae1b6ea1
+Version: 20191128.fe8e6c23
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.7OcUfv/_old 2019-11-30 10:39:42.156155460 +0100
+++ /var/tmp/diff_new_pack.7OcUfv/_new 2019-11-30 10:39:42.184155457 +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">ae1b6ea152513f1a21e2538e9b168093cfedea7a</param>
+ <param
name="changesrevision">6e918d63b6613f1190ccba1613346163271a85a1</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20191127.ae1b6ea1.obscpio ->
openSUSE-release-tools-20191128.fe8e6c23.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20191127.ae1b6ea1/check_source.py
new/openSUSE-release-tools-20191128.fe8e6c23/check_source.py
--- old/openSUSE-release-tools-20191127.ae1b6ea1/check_source.py
2019-11-27 12:43:57.000000000 +0100
+++ new/openSUSE-release-tools-20191128.fe8e6c23/check_source.py
2019-11-28 13:56:36.000000000 +0100
@@ -278,10 +278,12 @@
sys.stdout = _stdout
return result
- def package_source_parse(self, project, package, revision=None):
+ def _package_source_parse(self, project, package, revision=None,
repository=None):
query = {'view': 'info', 'parse': 1}
if revision:
query['rev'] = revision
+ if repository:
+ query['repository'] = repository
url = osc.core.makeurl(self.apiurl, ['source', project, package],
query)
ret = {'name': None, 'version': None}
@@ -292,6 +294,10 @@
self.logger.error('ERROR in URL %s [%s]' % (url, e))
return ret
+ if xml.find('error') is not None:
+ self.logger.error("%s/%s/%s: %s", project, package, repository,
xml.find('error').text)
+ return ret
+
# ET boolean check fails.
if xml.find('name') is not None:
ret['name'] = xml.find('name').text
@@ -302,6 +308,36 @@
if xml.find('filename') is not None:
ret['filename'] = xml.find('filename').text
+ self.logger.debug("%s/%s/%s: %s", project, package, repository, ret)
+
+ return ret
+
+ def package_source_parse(self, project, package, revision=None):
+ ret = self._package_source_parse(project, package, revision)
+
+ if ret['name'] is not None:
+ return ret
+
+ d = {}
+ for repo in osc.core.get_repositories_of_project(self.apiurl, project):
+ r = self._package_source_parse(project, package, revision, repo)
+ if r['name'] is not None:
+ d[r['name']] = r
+
+ if len(d) == 1:
+ # here is only one so use that
+ ret = d[next(iter(d))]
+ else:
+ # check if any name matches
+ self.logger.debug("found multiple names %s", ', '.join(d.keys()))
+ for n, r in d.items():
+ if n == package:
+ ret = r
+ break
+
+ if ret['name'] is None:
+ self.logger.error("none of the names matched")
+
return ret
def only_changes(self):
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.7OcUfv/_old 2019-11-30 10:39:46.184154977 +0100
+++ /var/tmp/diff_new_pack.7OcUfv/_new 2019-11-30 10:39:46.184154977 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20191127.ae1b6ea1
-mtime: 1574855037
-commit: ae1b6ea152513f1a21e2538e9b168093cfedea7a
+version: 20191128.fe8e6c23
+mtime: 1574945796
+commit: fe8e6c232db14fdfe79ad3aab9e71cda9230cb8c
