diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2017-04-25 16:08:14 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2017-04-25 16:08:14 +0200 |
| commit | ac8892bdb227e135ed7e5c3f8bb34b6b031a4579 (patch) | |
| tree | 371966072b6aa88fd37f388bafbf445874ecd4bf | |
| parent | c7e724a148fbc1ca46508d953302b697ff35af16 (diff) | |
| download | rust-ac8892bdb227e135ed7e5c3f8bb34b6b031a4579.tar.gz rust-ac8892bdb227e135ed7e5c3f8bb34b6b031a4579.zip | |
Accept arbitrary filenames into URLs in build-manifest
instead of combining the component and target into a URL.
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index a8cb30da435..c6f6b2dbc0f 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -293,7 +293,7 @@ impl Builder { pkg.target.insert(host.to_string(), Target { available: true, - url: Some(self.url("rust", host)), + url: Some(self.url(&filename)), hash: Some(digest), components: Some(components), extensions: Some(extensions), @@ -325,7 +325,7 @@ impl Builder { (name.to_string(), Target { available: true, - url: Some(self.url(pkgname, name)), + url: Some(self.url(&filename)), hash: Some(digest), components: None, extensions: None, @@ -338,11 +338,11 @@ impl Builder { }); } - fn url(&self, component: &str, target: &str) -> String { + fn url(&self, filename: &str) -> String { format!("{}/{}/{}", self.s3_address, self.date, - self.filename(component, target)) + filename) } fn filename(&self, component: &str, target: &str) -> String { |
