diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-06-20 20:57:15 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-06-20 20:57:15 +0200 |
| commit | d486a774540c27ba8c06f8cdd3a95326cbdb0028 (patch) | |
| tree | 4bc02193cd78a9919b34bc821c606c1942d2a1be /src/runner/runc/run.rs | |
| parent | 79a60833a6f7c856818afc0b0ef7a51bbf158072 (diff) | |
| download | rebel-d486a774540c27ba8c06f8cdd3a95326cbdb0028.tar rebel-d486a774540c27ba8c06f8cdd3a95326cbdb0028.zip | |
executor: generate and print task output information
Diffstat (limited to 'src/runner/runc/run.rs')
| -rw-r--r-- | src/runner/runc/run.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runner/runc/run.rs b/src/runner/runc/run.rs index dc62159..9eb5bc0 100644 --- a/src/runner/runc/run.rs +++ b/src/runner/runc/run.rs @@ -69,7 +69,7 @@ fn output_filename(task: TaskRef) -> PathBuf { Path::new("build/state").join(format!("{}.tar", task)) } -fn collect_output(task: TaskRef, task_def: Task) -> Result<OutputHash, io::Error> { +fn collect_output(task: TaskRef, task_def: TaskDef) -> Result<OutputHash, io::Error> { let file = util::unix::create_as( output_filename(task), Some(unshare::BUILD_UID), @@ -83,10 +83,10 @@ fn collect_output(task: TaskRef, task_def: Task) -> Result<OutputHash, io::Error file.sync_all()?; - Ok(hasher.finalize().into()) + Ok(StringHash(hasher.finalize().into())) } -pub fn handle_task(task: TaskRef, task_def: Task) -> Result<OutputHash, Error> { +pub fn handle_task(task: TaskRef, task_def: TaskDef) -> Result<OutputHash, Error> { init_task()?; spec::generate_spec(task_def.run.as_str()) |