mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-27 10:16:14 +01:00
Code

Merge branch 'master' of https://github.com/andreas-schwab/osc

Browse Source
This commit is contained in:
Marcus Huewe 2015-08-06 13:58:49 +02:00
commit da40039bbc
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osc/core.py
View File

@ -2911,7 +2911,7 @@ def shorttime(t):
if time.gmtime()[0] == time.gmtime(t)[0]: if time.gmtime()[0] == time.gmtime(t)[0]:
# same year # same year
return time.strftime('%b %d %H:%M %Z', time.gmtime(t)) return time.strftime('%b %d %H:%M', time.gmtime(t))
else: else:
return time.strftime('%b %d %Y', time.gmtime(t)) return time.strftime('%b %d %Y', time.gmtime(t))
@ -5763,7 +5763,7 @@ def get_buildhistory(apiurl, prj, package, repository, arch, format = 'text'):
versrel = node.get('versrel') versrel = node.get('versrel')
bcnt = int(node.get('bcnt')) bcnt = int(node.get('bcnt'))
t = time.gmtime(int(node.get('time'))) t = time.gmtime(int(node.get('time')))
t = time.strftime('%Y-%m-%d %H:%M:%S %Z', t) t = time.strftime('%Y-%m-%d %H:%M:%S', t)
if format == 'csv': if format == 'csv':
r.append('%s|%s|%s|%s.%d' % (t, srcmd5, rev, versrel, bcnt)) r.append('%s|%s|%s|%s.%d' % (t, srcmd5, rev, versrel, bcnt))
@ -5796,19 +5796,16 @@ def print_jobhistory(apiurl, prj, current_package, repository, arch, format = 't
if not reason: if not reason:
reason = "unknown" reason = "unknown"
code = node.get('code') code = node.get('code')
rt = int(node.get('readytime'))
readyt = time.gmtime(rt)
readyt = time.strftime('%Y-%m-%d %H:%M:%S %Z', readyt)
st = int(node.get('starttime')) st = int(node.get('starttime'))
et = int(node.get('endtime')) et = int(node.get('endtime'))
endtime = time.strftime('%Y-%m-%d %H:%M:%S %Z', time.gmtime(et)) endtime = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(et))
waittm = time.gmtime(et-st) waittm = et-st
if waittm.tm_mday > 1: if waittm > 24*60*60:
waitbuild = "%1dd %2dh %2dm %2ds" % (waittm.tm_mday-1, waittm.tm_hour, waittm.tm_min, waittm.tm_sec) waitbuild = "%1dd %2dh %2dm %2ds" % (waittm / (24*60*60), (waittm / (60*60)) % 24, (waittm / 60) % 60, waittm % 60)
elif waittm.tm_hour: elif waittm > 60*60:
waitbuild = " %2dh %2dm %2ds" % (waittm.tm_hour, waittm.tm_min, waittm.tm_sec) waitbuild = " %2dh %2dm %2ds" % (waittm / (60*60), (waittm / 60) % 60, waittm % 60)
else: else:
waitbuild = " %2dm %2ds" % (waittm.tm_min, waittm.tm_sec) waitbuild = " %2dm %2ds" % (waittm / 60, waittm % 60)
if format == 'csv': if format == 'csv':
print('%s|%s|%s|%s|%s|%s' % (endtime, package, reason, code, waitbuild, worker)) print('%s|%s|%s|%s|%s|%s' % (endtime, package, reason, code, waitbuild, worker))
@ -5863,7 +5860,7 @@ def get_commitlog(apiurl, prj, package, revision, format = 'text', meta = False,
except: except:
requestid = "" requestid = ""
t = time.gmtime(int(node.find('time').text)) t = time.gmtime(int(node.find('time').text))
t = time.strftime('%Y-%m-%d %H:%M:%S %Z', t) t = time.strftime('%Y-%m-%d %H:%M:%S', t)
if format == 'csv': if format == 'csv':
s = '%s|%s|%s|%s|%s|%s|%s' % (rev, user, t, srcmd5, version, s = '%s|%s|%s|%s|%s|%s|%s' % (rev, user, t, srcmd5, version,