[gnome-ostree] Update buildsystem for taskCwd rename
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] Update buildsystem for taskCwd rename
- Date: Thu, 13 Jun 2013 19:04:08 +0000 (UTC)
commit 596aa2c17ded4c5c78ac67a210feb0376959ecb6
Author: Colin Walters <walters verbum org>
Date: Thu Jun 13 15:03:49 2013 -0400
Update buildsystem for taskCwd rename
src/js/builtins/autobuilder.js | 7 +++----
src/js/builtins/make.js | 9 ++++-----
2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/src/js/builtins/autobuilder.js b/src/js/builtins/autobuilder.js
index 118b2f2..ac119c7 100644
--- a/src/js/builtins/autobuilder.js
+++ b/src/js/builtins/autobuilder.js
@@ -100,8 +100,7 @@ const Autobuilder = new Lang.Class({
},
_onTaskExecuting: function(taskmaster, task) {
- let workdir = task._workdir;
- print("Task " + task.name + " executing in " + workdir.get_path());
+ print("Task " + task.name + " executing in " + task._taskCwd.get_path());
this._updateStatus();
},
@@ -109,10 +108,10 @@ const Autobuilder = new Lang.Class({
if (task.name == 'resolve')
this._runResolve();
if (success) {
- print("Task " + task.name + " complete: " + task._workdir.get_path());
+ print("Task " + task.name + " complete: " + task._taskCwd.get_path());
} else {
this._failed = true;
- print("Task " + task.name + " failed: " + task._workdir.get_path());
+ print("Task " + task.name + " failed: " + task._taskCwd.get_path());
}
this._updateStatus();
},
diff --git a/src/js/builtins/make.js b/src/js/builtins/make.js
index 608da67..110b165 100644
--- a/src/js/builtins/make.js
+++ b/src/js/builtins/make.js
@@ -119,9 +119,8 @@ const Make = new Lang.Class({
},
_onTaskExecuting: function(taskmaster, task) {
- let workdir = task._workdir;
- print("Task " + task.name + " executing in " + workdir.get_path());
- let output = workdir.get_child('output.txt');
+ print("Task " + task.name + " executing in " + task._taskCwd.get_path());
+ let output = task._taskCwd.get_child('output.txt');
if (this._oneOnly) {
let context = new GSystem.SubprocessContext({ argv: ['tail', '-f', output.get_path() ] });
this._tail = new GSystem.Subprocess({ context: context });
@@ -133,10 +132,10 @@ const Make = new Lang.Class({
if (this._oneOnly)
this._tail.request_exit();
if (success) {
- print("Task " + task.name + " complete: " + task._workdir.get_path());
+ print("Task " + task.name + " complete: " + task._taskCwd.get_path());
} else {
this._failed = true;
- print("Task " + task.name + " failed: " + task._workdir.get_path());
+ print("Task " + task.name + " failed: " + task._taskCwd.get_path());
}
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]