diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-08-01 17:42:09 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-08-01 17:58:56 +0200 |
| commit | 089b167812624cc69aac95d5a1b69688e3f97117 (patch) | |
| tree | 2255fe27e3356307e33c20c2281d60bbfbec293b /guix | |
| parent | 66c65aafa73f9ca816825abb7f84b353f7bcfdf6 (diff) | |
publish: Do not compress already-compressed files.
* guix/scripts/publish.scm (narinfo-string): Force %NO-COMPRESSION when
STORE-PATH matches 'compressed-file?'.
* guix/utils.scm (compressed-file?): New procedure.
* tests/publish.scm ("/*.narinfo for a compressed file"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/publish.scm | 4 | ||||
| -rw-r--r-- | guix/utils.scm | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index 2ca2aeebe3..8404e540f8 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -50,6 +50,7 @@ #:use-module (guix zlib) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module ((guix utils) #:select (compressed-file?)) #:use-module ((guix build utils) #:select (dump-port)) #:export (guix-publish)) @@ -199,6 +200,9 @@ compression disabled~%")) if STORE-PATH is invalid. Produce a URL that corresponds to COMPRESSION. The narinfo is signed with KEY." (let* ((path-info (query-path-info store store-path)) + (compression (if (compressed-file? store-path) + %no-compression + compression)) (url (encode-and-join-uri-path `("nar" ,@(match compression diff --git a/guix/utils.scm b/guix/utils.scm index 9e1b8ead0a..c68094cf49 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -79,6 +79,7 @@ arguments-from-environment-variable file-extension file-sans-extension + compressed-file? switch-symlinks call-with-temporary-output-file call-with-temporary-directory @@ -551,6 +552,11 @@ minor version numbers from version-string." (substring file 0 dot) file))) +(define (compressed-file? file) + "Return true if FILE denotes a compressed file." + (->bool (member (file-extension file) + '("gz" "bz2" "xz" "lz" "tgz" "tbz2" "zip")))) + (define (switch-symlinks link target) "Atomically switch LINK, a symbolic link, to point to TARGET. Works both when LINK already exists and when it does not." |