diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-05-22T21·36+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-06-24T20·12+0200 |
| commit | f8b30338ac231262bdf19844f044f0572c460048 (patch) | |
| tree | 709d86e57a0fa53da7a52422ea9247e1d4034b9d /src/libexpr/common-eval-args.cc | |
| parent | 7b9c68766d513260d5262d5782b46384834cdb33 (diff) | |
Refactor downloadCached() interface
(cherry picked from commit df3f5a78d5ab0a1f2dc9d288b271b38a9b8b33b5)
Diffstat (limited to 'src/libexpr/common-eval-args.cc')
| -rw-r--r-- | src/libexpr/common-eval-args.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libexpr/common-eval-args.cc b/src/libexpr/common-eval-args.cc index 37c74a94b2..13950ab8d1 100644 --- a/src/libexpr/common-eval-args.cc +++ b/src/libexpr/common-eval-args.cc @@ -45,9 +45,11 @@ Bindings * MixEvalArgs::getAutoArgs(EvalState & state) Path lookupFileArg(EvalState & state, string s) { - if (isUri(s)) - return getDownloader()->downloadCached(state.store, s, true).path; - else if (s.size() > 2 && s.at(0) == '<' && s.at(s.size() - 1) == '>') { + if (isUri(s)) { + CachedDownloadRequest request(s); + request.unpack = true; + return getDownloader()->downloadCached(state.store, request).path; + } else if (s.size() > 2 && s.at(0) == '<' && s.at(s.size() - 1) == '>') { Path p = s.substr(1, s.size() - 2); return state.findFile(p); } else |