diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2021-02-08 10:55:03 +0100 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2021-02-08 11:06:00 +0100 |
| commit | 09ca31a64761610cd2fc98a5668d1676046b2d89 (patch) | |
| tree | 23bac0fbcc8b92c470fa6c6b20f4c6570e47e55b /src/endpoint/configured.rs | |
| parent | 2f53c7acf4ad5bd9830d3b122231ed06841811c3 (diff) | |
| parent | d319579fc89b5ac09f10abf4bfc77c21b0fc65ce (diff) | |
Merge branch 'remove-artifact-type'
Diffstat (limited to 'src/endpoint/configured.rs')
| -rw-r--r-- | src/endpoint/configured.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/endpoint/configured.rs b/src/endpoint/configured.rs index 822d533..065f83e 100644 --- a/src/endpoint/configured.rs +++ b/src/endpoint/configured.rs @@ -390,9 +390,8 @@ impl<'a> PreparedContainer<'a> { .cloned() .map(|art| async { let artifact_file_name = art - .path() .file_name() - .ok_or_else(|| anyhow!("BUG: artifact {} is not a file", art.path().display())) + .ok_or_else(|| anyhow!("BUG: artifact {} is not a file", art.display())) .with_context(|| { anyhow!( "Collecting artifacts for copying to container {}", @@ -402,7 +401,7 @@ impl<'a> PreparedContainer<'a> { let destination = PathBuf::from("/inputs/").join(artifact_file_name); trace!( "Copying {} to container: {}:{}", - art.path().display(), + art.display(), container.id(), destination.display() ); @@ -410,13 +409,13 @@ impl<'a> PreparedContainer<'a> { .read() .await .root_path() - .join(art.path())? + .join(&art)? .read() .await .with_context(|| { anyhow!( "Reading artifact {}, so it can be copied to container", - art.path().display() + art.display() ) })?; @@ -426,7 +425,7 @@ impl<'a> PreparedContainer<'a> { .with_context(|| { anyhow!( "Copying artifact {} to container {} at {}", - art.path().display(), + art.display(), container.id(), destination.display() ) |