[gnome-ostree/wip/simple-cleanups: 14/19] task: Remove dead code
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree/wip/simple-cleanups: 14/19] task: Remove dead code
- Date: Thu, 13 Jun 2013 18:39:50 +0000 (UTC)
commit 9fb96a076b7caf96909bbbd7c0f8e42c02728fbe
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Jun 13 14:26:46 2013 -0400
task: Remove dead code
The taskmaster will never be null.
src/js/task.js | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/src/js/task.js b/src/js/task.js
index 69f7ead..74914eb 100644
--- a/src/js/task.js
+++ b/src/js/task.js
@@ -325,11 +325,7 @@ const TaskDef = new Lang.Class({
this.vars = vars;
this.parameters = Params.parse(parameters, this.DefaultParameters);
- if (taskmaster !== null)
- this.workdir = taskmaster.path.get_parent();
- else
- this.workdir = Gio.File.new_for_path(GLib.getenv('_OSTBUILD_WORKDIR'));
-
+ this.workdir = taskmaster.path.get_parent();
BuildUtil.checkIsWorkDirectory(this.workdir);
this.resultdir = this.workdir.get_child('results');
@@ -449,9 +445,6 @@ const TaskDef = new Lang.Class({
let baseArgv = ['ostbuild', 'run-task', this.name, JSON.stringify(this.parameters)];
let context = new GSystem.SubprocessContext({ argv: baseArgv });
context.set_cwd(this._workdir.get_path());
- let childEnv = GLib.get_environ();
- childEnv.push('_OSTBUILD_WORKDIR=' + this.workdir.get_path());
- context.set_environment(childEnv);
if (this.PreserveStdout) {
let outPath = this._workdir.get_child('output.txt');
context.set_stdout_file_path(outPath.get_path());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]