packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostbuild: Change metadata keys for artifacts 

"ostbuild-name" is important to tie back in to the snapshot.
"ostbuild-revision" is shorter than ostbuild-artifact-version.
This commit is contained in:
Colin Walters 2012-02-27 19:29:33 -05:00
parent 12f2f8929d
commit 6890444f28
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ostbuild/pyostbuild/builtin_build.py
View File

@ -116,7 +116,7 @@ class OstbuildBuild(builtins.Builtin):
log("Previous build of '%s' is %s" % (buildname, previous_build_version)) log("Previous build of '%s' is %s" % (buildname, previous_build_version))
previous_vcs_version = run_sync_get_output(['ostree', '--repo=' + self.repo, previous_vcs_version = run_sync_get_output(['ostree', '--repo=' + self.repo,
'show', '--print-metadata-key=ostbuild-artifact-version', 'show', '--print-metadata-key=ostbuild-revision',
previous_build_version]) previous_build_version])
previous_vcs_version = previous_vcs_version.strip() previous_vcs_version = previous_vcs_version.strip()
@ -167,15 +167,10 @@ class OstbuildBuild(builtins.Builtin):
else: else:
run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src) run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src)
# Reread metadata to get buildroot version
f = open(metadata_path)
artifact_meta = json.load(f)
f.close()
args = ['ostree', '--repo=' + self.repo, args = ['ostree', '--repo=' + self.repo,
'commit', '-b', buildname, '-s', 'Build', 'commit', '-b', buildname, '-s', 'Build',
'--add-metadata-string=ostbuild-buildroot-version=' + artifact_meta['buildroot-version'], '--add-metadata-string=ostbuild-name=' + artifact_meta['name'],
'--add-metadata-string=ostbuild-artifact-version=' + artifact_meta['revision'], '--add-metadata-string=ostbuild-revision=' + artifact_meta['revision'],
'--owner-uid=0', '--owner-gid=0', '--no-xattrs', '--owner-uid=0', '--owner-gid=0', '--no-xattrs',
'--skip-if-unchanged'] '--skip-if-unchanged']