Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-03-16 10:41:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 Mar 16 10:41:31 2018 rev:70 rq:586541 version:20180312.9a26912
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-03-13 10:23:57.653937317 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-03-16 10:42:09.699038675 +0100
@@ -1,0 +2,13 @@
+Mon Mar 12 21:04:21 UTC 2018 - [email protected]
+
+- Update to version 20180312.9a26912:
+ * pkglistgen: do_dump_solv(): include hash in update solv to avoid download.
+ * pkglistgen: do_dump_solv(): utilize os.path.join().
+
+-------------------------------------------------------------------
+Mon Mar 12 13:14:34 UTC 2018 - [email protected]
+
+- Update to version 20180312.054eef2:
+ * ReviewBot: make interval work without tty
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180312.35e7c51.obscpio
New:
----
openSUSE-release-tools-20180312.9a26912.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.bMXAFu/_old 2018-03-16 10:42:11.530972712 +0100
+++ /var/tmp/diff_new_pack.bMXAFu/_new 2018-03-16 10:42:11.534972568 +0100
@@ -20,7 +20,7 @@
%define source_dir osc-plugin-factory
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180312.35e7c51
+Version: 20180312.9a26912
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.bMXAFu/_old 2018-03-16 10:42:11.594970407 +0100
+++ /var/tmp/diff_new_pack.bMXAFu/_new 2018-03-16 10:42:11.594970407 +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">f1e56df8b9e8a123911ec8e4f2b08dd6c27db8b4</param>
+ <param
name="changesrevision">9a26912ab5c087e5c32731ac176786f93383e31c</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180312.35e7c51.obscpio ->
openSUSE-release-tools-20180312.9a26912.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180312.35e7c51/ReviewBot.py
new/openSUSE-release-tools-20180312.9a26912/ReviewBot.py
--- old/openSUSE-release-tools-20180312.35e7c51/ReviewBot.py 2018-03-12
10:26:07.000000000 +0100
+++ new/openSUSE-release-tools-20180312.9a26912/ReviewBot.py 2018-03-12
21:55:44.000000000 +0100
@@ -33,6 +33,7 @@
from osclib.stagingapi import StagingAPI
import signal
import datetime
+import time
import yaml
try:
@@ -697,14 +698,18 @@
self.logger.exception(e)
if interval:
- self.logger.info("sleeping %d minutes. Press enter to check
now ..."%interval)
- signal.alarm(interval*60)
- try:
- raw_input()
- except ExTimeout:
- pass
- signal.alarm(0)
- self.logger.info("recheck at
%s"%datetime.datetime.now().isoformat())
+ if os.isatty(0):
+ self.logger.info("sleeping %d minutes. Press enter to
check now ..."%interval)
+ signal.alarm(interval*60)
+ try:
+ raw_input()
+ except ExTimeout:
+ pass
+ signal.alarm(0)
+ self.logger.info("recheck at
%s"%datetime.datetime.now().isoformat())
+ else:
+ self.logger.info("sleeping %d minutes." % interval)
+ time.sleep(interval * 60)
continue
break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180312.35e7c51/pkglistgen.py
new/openSUSE-release-tools-20180312.9a26912/pkglistgen.py
--- old/openSUSE-release-tools-20180312.35e7c51/pkglistgen.py 2018-03-12
10:26:07.000000000 +0100
+++ new/openSUSE-release-tools-20180312.9a26912/pkglistgen.py 2018-03-12
21:55:44.000000000 +0100
@@ -878,18 +878,16 @@
ofh = sys.stdout
if self.options.output_dir:
build, repo_style = self.dump_solv_build(baseurl)
- name = '{}/{}.solv'.format(self.options.output_dir, build)
+ name = os.path.join(self.options.output_dir,
'{}.solv'.format(build))
# For update repo name never changes so always update.
if not opts.overwrite and repo_style != 'update' and
os.path.exists(name):
logger.info("%s exists", name)
return name
- ofh = open(name + '.new', 'w')
pool = solv.Pool()
pool.setarch()
repo = pool.add_repo(''.join(random.choice(string.letters) for _ in
range(5)))
- f = tempfile.TemporaryFile()
path_prefix = 'suse/' if name and repo_style == 'build' else ''
url = urlparse.urljoin(baseurl, path_prefix + 'repodata/repomd.xml')
repomd = requests.get(url)
@@ -897,6 +895,23 @@
root = ET.fromstring(repomd.content)
primary_element = root.find('.//r:data[@type="primary"]', ns)
location = primary_element.find('r:location', ns).get('href')
+ sha256_expected = primary_element.find('r:checksum[@type="sha256"]',
ns).text
+
+ # No build information in update repo to use repomd checksum in name.
+ if repo_style == 'update':
+ name = os.path.join(self.options.output_dir,
'{}::{}.solv'.format(build, sha256_expected))
+ if not opts.overwrite and os.path.exists(name):
+ logger.info("%s exists", name)
+ return name
+
+ # Only consider latest update repo so remove old versions.
+ # Pre-release builds only make sense for non-update repos and once
+ # releases then only relevant for next product which does not
+ # consider pre-release from previous version.
+ for old_solv in glob.glob(os.path.join(self.options.output_dir,
'{}::*.solv'.format(build))):
+ os.remove(old_solv)
+
+ f = tempfile.TemporaryFile()
f.write(repomd.content)
f.flush()
os.lseek(f.fileno(), 0, os.SEEK_SET)
@@ -904,7 +919,6 @@
url = urlparse.urljoin(baseurl, path_prefix + location)
with requests.get(url, stream=True) as primary:
sha256 = hashlib.sha256(primary.content).hexdigest()
- sha256_expected =
primary_element.find('r:checksum[@type="sha256"]', ns).text
if sha256 != sha256_expected:
raise Exception('checksums do not match {} !=
{}'.format(sha256, sha256_expected))
@@ -915,6 +929,8 @@
os.lseek(f.fileno(), 0, os.SEEK_SET)
repo.add_rpmmd(f, None, 0)
repo.create_stubs()
+
+ ofh = open(name + '.new', 'w')
repo.write(ofh)
if name is not None:
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.bMXAFu/_old 2018-03-16 10:42:13.098916254 +0100
+++ /var/tmp/diff_new_pack.bMXAFu/_new 2018-03-16 10:42:13.102916110 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180312.35e7c51
-mtime: 1520846767
-commit: 35e7c51c1653c36d80cae97804d95f1f34ce9402
+version: 20180312.9a26912
+mtime: 1520888144
+commit: 9a26912ab5c087e5c32731ac176786f93383e31c
