From 453be845afb106bfaf3b1fbf2dca078160a81366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 12 Feb 2015 12:44:47 +0100 Subject: [PATCH] - fix crash on buildhistory with source linked packages revision is a md5 string in that case (github issue#136) --- osc/core.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/osc/core.py b/osc/core.py index 3476a846..253ec309 100644 --- a/osc/core.py +++ b/osc/core.py @@ -5701,7 +5701,7 @@ def get_buildhistory(apiurl, prj, package, repository, arch, format = 'text'): r = [] for node in root.findall('entry'): - rev = int(node.get('rev')) + rev = node.get('rev') srcmd5 = node.get('srcmd5') versrel = node.get('versrel') bcnt = int(node.get('bcnt')) @@ -5709,12 +5709,13 @@ def get_buildhistory(apiurl, prj, package, repository, arch, format = 'text'): t = time.strftime('%Y-%m-%d %H:%M:%S', t) if format == 'csv': - r.append('%s|%s|%d|%s.%d' % (t, srcmd5, rev, versrel, bcnt)) + r.append('%s|%s|%s|%s.%d' % (t, srcmd5, rev, versrel, bcnt)) else: - r.append('%s %s %6d %s.%d' % (t, srcmd5, rev, versrel, bcnt)) + bversrel='%s.%d' % (versrel, bcnt) + r.append('%s %s %s %s' % (t, srcmd5, bversrel.ljust(16)[:16], rev)) if format == 'text': - r.insert(0, 'time srcmd5 rev vers-rel.bcnt') + r.insert(0, 'time srcmd5 vers-rel.bcnt rev') return r