From 6890444f28aedace99a58f55b02efbd5d0b6465d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 27 Feb 2012 19:29:33 -0500 Subject: [PATCH] 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. --- src/ostbuild/pyostbuild/builtin_build.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/ostbuild/pyostbuild/builtin_build.py b/src/ostbuild/pyostbuild/builtin_build.py index 3497b782..de045fdb 100755 --- a/src/ostbuild/pyostbuild/builtin_build.py +++ b/src/ostbuild/pyostbuild/builtin_build.py @@ -116,7 +116,7 @@ class OstbuildBuild(builtins.Builtin): log("Previous build of '%s' is %s" % (buildname, previous_build_version)) 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_vcs_version = previous_vcs_version.strip() @@ -167,15 +167,10 @@ class OstbuildBuild(builtins.Builtin): else: 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, 'commit', '-b', buildname, '-s', 'Build', - '--add-metadata-string=ostbuild-buildroot-version=' + artifact_meta['buildroot-version'], - '--add-metadata-string=ostbuild-artifact-version=' + artifact_meta['revision'], + '--add-metadata-string=ostbuild-name=' + artifact_meta['name'], + '--add-metadata-string=ostbuild-revision=' + artifact_meta['revision'], '--owner-uid=0', '--owner-gid=0', '--no-xattrs', '--skip-if-unchanged']