[gnome-ostree] build: Mirror force-rebuild logic for yocto base too
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] build: Mirror force-rebuild logic for yocto base too
- Date: Sat, 5 Jan 2013 13:12:41 +0000 (UTC)
commit 3a5e519f9c1c9301295875b3634a31698126c349
Author: Colin Walters <walters verbum org>
Date: Sat Jan 5 07:56:33 2013 -0500
build: Mirror force-rebuild logic for yocto base too
So that local: does what I want.
src/ostbuild/js/build.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/ostbuild/js/build.js b/src/ostbuild/js/build.js
index 8871d25..0b7b2e6 100644
--- a/src/ostbuild/js/build.js
+++ b/src/ostbuild/js/build.js
@@ -556,6 +556,7 @@ const Build = new Lang.Class({
/* Build the Yocto base system. */
_buildBase: function(architecture, cancellable) {
let basemeta = Snapshot.expandComponent(this._snapshot, this._snapshot['base']);
+ let basename = basemeta['name'];
let checkoutdir = this.workdir.get_child('checkouts').get_child(basemeta['name']);
GSystem.file_ensure_directory(checkoutdir.get_parent(), true, cancellable);
@@ -576,11 +577,16 @@ const Build = new Lang.Class({
let builddirName = Format.vprintf('build-%s-%s', [basemeta['name'], architecture]);
let builddir = this.workdir.get_child(builddirName);
+ let forceRebuild = (this.forceBuildComponents[basename] ||
+ basemeta['src'].indexOf('local:') == 0);
+
let builtRevisionPath = builddir.get_child('built-revision');
if (builtRevisionPath.query_exists(cancellable)) {
let builtRevision = GSystem.file_load_contents_utf8(builtRevisionPath, cancellable);
builtRevision = builtRevision.replace(/[ \n]/g, '');
- if (builtRevision == basemeta['revision']) {
+ if (forceRebuild) {
+ print(Format.vprintf("%s forced rebuild", [builddirName]));
+ } else if (builtRevision == basemeta['revision']) {
print(Format.vprintf("Already built %s at %s", [builddirName, builtRevision]));
return;
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]