diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-02-07 10:02:52 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-02-07 10:02:52 +0100 |
| commit | 0196b80508e1f12f539b58dea288bbe4bc5a033b (patch) | |
| tree | 322871df0f94ae772e08ef3499c7a09d04aec269 /nar-herder/cached-compression.scm | |
| parent | 8f7b2b24e36b306d543670b6a4d3310e5be2f944 (diff) | |
| download | nar-herder-0196b80508e1f12f539b58dea288bbe4bc5a033b.tar nar-herder-0196b80508e1f12f539b58dea288bbe4bc5a033b.tar.gz | |
Fix uri encoding issues with respect to cached compression files
Diffstat (limited to 'nar-herder/cached-compression.scm')
| -rw-r--r-- | nar-herder/cached-compression.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nar-herder/cached-compression.scm b/nar-herder/cached-compression.scm index 2711154..cd334af 100644 --- a/nar-herder/cached-compression.scm +++ b/nar-herder/cached-compression.scm @@ -423,8 +423,9 @@ narinfo-id)) (log-msg 'DEBUG "making " target-compression " for " - (basename - (assq-ref (first narinfo-files) 'url))) + (uri-decode + (basename + (assq-ref (first narinfo-files) 'url)))) (let* ((source-narinfo-file ;; There's no specific logic to this, it should be possible @@ -463,7 +464,7 @@ ;; If it's a filename, then it's the canonical path to ;; the storage directory nar-source - (assq-ref source-narinfo-file 'url))) + (uri-decode (assq-ref source-narinfo-file 'url)))) (else (error "unknown nar source"))))) @@ -473,8 +474,10 @@ (dest-filename (string-append dest-directory - "/" (basename - (assq-ref source-narinfo-file 'url)))) + "/" + (uri-decode + (basename + (assq-ref source-narinfo-file 'url))))) (tmp-dest-filename (string-append dest-filename ".tmp"))) |