01/01: publish: Keep compression disabled when zlib is missing.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 053fa76ae7bb579fe5fc9dedfc492411e6804cf0
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jul 19 16:46:16 2016 +0200

    publish: Keep compression disabled when zlib is missing.
    
    Reported by David Thompson.
    
    * guix/scripts/publish.scm (%options)[--compression]: Warn if LEVEL > 0
    and zlib is missing, and return RESULT.
---
 guix/scripts/publish.scm |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index 3e1ecb9..3baceaf 100644
--- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm
@@ -127,8 +127,14 @@ Publish ~a over HTTP.\n") %store-directory)
                     (0
                      (alist-cons 'compression %no-compression result))
                     (level
-                     (alist-cons 'compression (compression 'gzip level)
-                                 result)))))
+                     (if (zlib-available?)
+                         (alist-cons 'compression
+                                     (compression 'gzip level)
+                                     result)
+                         (begin
+                           (warning (_ "zlib support is missing; \
+compression disabled~%"))
+                           result))))))
         (option '("ttl") #t #f
                 (lambda (opt name arg result)
                   (let ((duration (string->duration arg)))