Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-06-22 13:35:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 Jun 22 13:35:00 2018 rev:105 rq:618142 version:20180620.d4172e6
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-06-20 15:35:37.452785625 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-06-22 13:35:13.171013656 +0200
@@ -1,0 +2,9 @@
+Wed Jun 20 20:50:51 UTC 2018 - [email protected]
+
+- Update to version 20180620.d4172e6:
+ * osclib/stagingapi: superseded_request(): revert poor indentation changes.
+ * metrics: thankfully we lived past the days of assembly variable name
limits.
+ * metrics: ingest_dashboard(): replace max_revision duplicate variable
nonsense
+ * Revert "Output Attribute metrics (not well tested)"
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180620.78e8212.obscpio
New:
----
openSUSE-release-tools-20180620.d4172e6.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.n9rHCg/_old 2018-06-22 13:35:14.686957617 +0200
+++ /var/tmp/diff_new_pack.n9rHCg/_new 2018-06-22 13:35:14.690957469 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180620.78e8212
+Version: 20180620.d4172e6
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.n9rHCg/_old 2018-06-22 13:35:14.746955399 +0200
+++ /var/tmp/diff_new_pack.n9rHCg/_new 2018-06-22 13:35:14.746955399 +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">78e8212654331af3fb4e4d82a8609c1550a8a351</param>
+ <param
name="changesrevision">a909b40461c5619016bc1c8a1ecdb28a20962a29</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180620.78e8212.obscpio ->
openSUSE-release-tools-20180620.d4172e6.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180620.78e8212/metrics.py
new/openSUSE-release-tools-20180620.d4172e6/metrics.py
--- old/openSUSE-release-tools-20180620.78e8212/metrics.py 2018-06-20
09:58:28.000000000 +0200
+++ new/openSUSE-release-tools-20180620.d4172e6/metrics.py 2018-06-20
22:42:36.000000000 +0200
@@ -469,74 +469,6 @@
return None
-def ingest_attributes(api):
- url = api.makeurl(['source', api.project, '_project', '_history'],
{'meta': 1})
- root = ET.parse(osc.core.http_GET(url))
-
- points = []
- count = 0
- revision = 0
- last_attribute_md5 = ''
-
- last_values = {}
-
- for rev in root.findall('./revision'):
- revision = rev.get('rev')
- time = datetime.utcfromtimestamp(float(rev.find('./time').text))
-
- url = api.makeurl(['source', api.project, '_project'],
- {'meta': 1, 'rev': revision})
- root = ET.parse(osc.core.http_GET(url))
-
- attribute = root.find('.//entry[@name="_attribute"]')
- if attribute is None:
- continue
-
- attribute_md5 = attribute.get('md5')
- if attribute_md5 == last_attribute_md5:
- continue
- last_attribute_md5 = attribute_md5
-
- url = api.makeurl(['source', api.project, '_project', '_attribute'],
- {'meta': 1, 'rev': revision})
- root = ET.parse(osc.core.http_GET(url))
- #print revision, time, ET.tostring(root)
-
- for v in root.findall('.//attribute[@namespace="OSRT"]'):
- attribute_name = v.get('name')
- last_values.setdefault(attribute_name, None)
- if last_values[attribute_name] == v.find('value').text:
- continue
- # TODO: no idea what fields to make
- fields = {revision: revision }
-
- points.append({
- 'measurement': 'attribute_osrt_{}'.format(attribute_name),
- 'fields': fields,
- 'time': time,
- })
-
- points.append({
- 'measurement': 'project_meta_revision',
- 'fields': {
- 'revision': revision,
- },
- 'time': time,
- })
-
- if len(points) >= 1000:
- client.write_points(points, 's')
- count += len(points)
- points = []
-
- if len(points):
- client.write_points(points, 's')
- count += len(points)
-
- print('last revision processed: {}'.format(revision))
-
- return count
-
def ingest_dashboard(api):
index = revision_index(api)
@@ -551,9 +483,7 @@
count = 0
points = []
- max_revision = 0
for made, revision in sorted(index.items()):
- max_revision = revision
if not past:
if revision == revision_last:
past = True
@@ -591,7 +521,7 @@
client.write_points(points, 's')
count += len(points)
- print('last revision processed: {}'.format(max_revision))
+ print('last revision processed: {}'.format(revision if len(index) else
'none'))
return count
@@ -619,11 +549,10 @@
Cache.PATTERNS['/source/[^/]+/dashboard/[^/]+\?rev=.*'] = sys.maxint
Cache.init()
- c = Config(args.project)
+ config = Config(args.project)
api = StagingAPI(osc.conf.config['apiurl'], args.project)
- c.apply_remote(api)
+ config.apply_remote(api)
- print('attributes: wrote {:,} points'.format(ingest_attributes(api)))
print('dashboard: wrote {:,} points'.format(ingest_dashboard(api)))
global who_workaround_swap, who_workaround_miss
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180620.78e8212/osclib/stagingapi.py
new/openSUSE-release-tools-20180620.d4172e6/osclib/stagingapi.py
--- old/openSUSE-release-tools-20180620.78e8212/osclib/stagingapi.py
2018-06-20 09:58:28.000000000 +0200
+++ new/openSUSE-release-tools-20180620.d4172e6/osclib/stagingapi.py
2018-06-20 22:42:36.000000000 +0200
@@ -529,7 +529,7 @@
replace_old = request_old.find('state').get('name') in
['revoked', 'superseded']
if (request_new.find('action').get('type') == 'delete' and
- request_old.find('action').get('type') == 'delete'):
+ request_old.find('action').get('type') == 'delete'):
# Both delete requests.
if replace_old:
# Pointless since identical requests, but user desires.
@@ -543,7 +543,7 @@
return stage_info, True
if (request_new.find('action').get('type') !=
- request_old.find('action').get('type')):
+ request_old.find('action').get('type')):
# One delete and one submit.
if replace_old:
if self.ring_packages.get(target_package):
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.n9rHCg/_old 2018-06-22 13:35:15.550925679 +0200
+++ /var/tmp/diff_new_pack.n9rHCg/_new 2018-06-22 13:35:15.550925679 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180620.78e8212
-mtime: 1529481508
-commit: 78e8212654331af3fb4e4d82a8609c1550a8a351
+version: 20180620.d4172e6
+mtime: 1529527356
+commit: d4172e6aa799838e10d3e5eb04760d5126f8e35a
