particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR#3834: wait with writing timestamps after results dir is created

Browse source 
Merges #3834
https://pagure.io/koji/pull-request/3834

Fixes: #3833
https://pagure.io/koji/issue/3833
log_timestamps can fail during init
This commit is contained in:
Tomas Kopecek 2023-06-21 11:06:38 +02:00
commit 81767d0930
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builder/kojid
View file

@ -478,7 +478,7 @@ class BuildRoot(object):
logs[fname] = (None, None, 0, fpath)
if self.options.log_timestamps and not fname.endswith('-ts.log'):
ts_name = '%s-ts.log' % fname
fpath = os.path.join(resultdir, ts_name)
fpath = os.path.join(workdir, ts_name)
if os.path.exists(fpath):
with koji._open_text_file(fpath) as ts_file:
lines = ts_file.readlines()
@ -533,7 +533,7 @@ class BuildRoot(object):
position = fd.tell()
ts_offsets.setdefault(fname, 0)
if ts_offsets[fname] < position:
fpath = os.path.join(resultdir, '%s-ts.log' % fname)
fpath = os.path.join(workdir, '%s-ts.log' % fname)
with koji._open_text_file(fpath, 'at') as ts_file:
ts_file.write('%.0f %i\n' % (time.time(), position))
ts_offsets[fname] = position