Commit 30dcda05 authored by Simon McVittie's avatar Simon McVittie

Rename tarballs to their final name when using --no-ostree-commit

Fixes: 5128513cSigned-off-by: Simon McVittie's avatarSimon McVittie <smcv@collabora.com>
parent 5728d60c
......@@ -1074,10 +1074,11 @@ class Builder:
os.rename(output + '.new', output)
output = os.path.join(self.build_area, debug_tarball)
os.rename(output + '.new', output)
if self.ostree_commit:
output = os.path.join(self.build_area, debug_tarball)
logger.info('Committing %s to OSTree', debug_tarball)
os.rename(output + '.new', output)
subprocess.check_call([
'time',
'ostree',
......@@ -1094,9 +1095,11 @@ class Builder:
'--tar-autocreate-parents',
])
output = os.path.join(self.build_area, sources_tarball)
os.rename(output + '.new', output)
if self.ostree_commit:
logger.info('Committing %s to OSTree', sources_tarball)
output = os.path.join(self.build_area, sources_tarball)
os.rename(output + '.new', output)
subprocess.check_call([
'time',
'ostree',
......@@ -1113,10 +1116,11 @@ class Builder:
'--tar-autocreate-parents',
])
output = os.path.join(self.build_area, out_tarball)
os.rename(output + '.new', output)
if self.ostree_commit:
output = os.path.join(self.build_area, out_tarball)
logger.info('Committing %s to OSTree', out_tarball)
os.rename(output + '.new', output)
subprocess.check_call([
'time',
'ostree',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment