[gnome-ostree] ostbuild: Add git revision to output log message
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] ostbuild: Add git revision to output log message
- Date: Wed, 18 Jul 2012 20:57:48 +0000 (UTC)
commit 58a17e56efb87a157a58c88e68fab5698cd1b56a
Author: Colin Walters <walters verbum org>
Date: Wed Jul 18 16:30:31 2012 -0400
ostbuild: Add git revision to output log message
src/ostbuild/pyostbuild/builtin_build.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtin_build.py b/src/ostbuild/pyostbuild/builtin_build.py
index 211eacd..e703da1 100755
--- a/src/ostbuild/pyostbuild/builtin_build.py
+++ b/src/ostbuild/pyostbuild/builtin_build.py
@@ -104,24 +104,24 @@ class OstbuildBuild(builtins.Builtin):
previous_metadata = None
if previous_build_version is not None:
- log("Previous build of '%s' is %s" % (buildname, previous_build_version))
-
previous_metadata_text = run_sync_get_output(['ostree', '--repo=' + self.repo,
'cat', previous_build_version,
- '/_ostbuild-meta.json'],
- log_initiation=True)
+ '/_ostbuild-meta.json'])
sha = hashlib.sha256()
sha.update(previous_metadata_text)
previous_meta_digest = sha.hexdigest()
previous_metadata = json.loads(previous_metadata_text)
+ previous_vcs_version = previous_metadata.get('revision')
+
+ log("Previous build of %s is ostree:%s " % (buildname, previous_build_version))
if current_meta_digest == previous_meta_digest:
if not force_rebuild:
- log("Metadata is unchanged from previous; skipping build")
+ log("Reusing cached build at %s" % (previous_vcs_version))
return previous_build_version
else:
- log("Metadata is unchanged from previous; build forced regardless")
+ log("Build forced regardless")
else:
previous_vcs_version = previous_metadata.get('revision')
if current_vcs_version == previous_vcs_version:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]