--- Begin Message ---
|
Subject: |
[PATCH 1/1] download: Map file-name characters not allowed in store. |
|
Date: |
Thu, 8 Aug 2019 16:44:48 +0200 |
In the file-name to be used for storing into the store, replace any
character not allowed in the store-file-name by an underscore.
This is only done when NAME is not given and thus defaults to
toe URL's basename. If NAME is given, this is used unchanged,
allowing for more control by other functions.
Fixes <http://issues.guix.gnu.org/issue/26175>
* guix/download.scm (safe-name): New function.
(download-to-store): NAME defaults to the "safe" basename of URL.
---
guix/download.scm | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/guix/download.scm b/guix/download.scm
index b24aaa0a86..249f612237 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2019 Guy Fleury Iteriteka <address@hidden>
+;;; Copyright © 2019 Hartmut Goeel <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -563,13 +564,27 @@ own. This helper makes it easier to deal with \"zip
bombs\"."
#:graft? #f
#:local-build? #t)))
-(define* (download-to-store store url #:optional (name (basename url))
+(define (safe-name name)
+ "Replace any character not allowed in a stroe name by an underscore."
+
+ (define valid-characters
+ ;; according to nix/libstore/store-api.cc
+ (string->list (string-append "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789" "+-._?=")))
+ (string-map (lambda (c)
+ (if (member c valid-characters) c #\_))
+ name))
+
+(define* (download-to-store store url
+ #:optional (name (safe-name (basename url)))
#:key (log (current-error-port)) recursive?
(verify-certificate? #t))
- "Download from URL to STORE, either under NAME or URL's basename if
-omitted. Write progress reports to LOG. RECURSIVE? has the same effect as
-the same-named parameter of 'add-to-store'. VERIFY-CERTIFICATE? determines
-whether or not to validate HTTPS server certificates."
+ "Download from URL to STORE, either under NAME. If NAME is omitted, URL's
+basename with invalid characters replaced is used. Write progress reports to
+LOG. RECURSIVE? has the same effect as the same-named parameter of
+'add-to-store'. VERIFY-CERTIFICATE? determines whether or not to validate
+HTTPS server certificates."
(define uri
(string->uri url))
--
2.21.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#36976] [PATCH 1/1] download: Map file-name characters not allowed in store. |
|
Date: |
Thu, 26 Sep 2019 17:50:57 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 |
Committed as dec845606d2d184da31065fa26cd951b84b3ce2d
Thank for the review.
--
Regards
Hartmut Goebel
| Hartmut Goebel | address@hidden |
| www.crazy-compilers.com | compilers which you thought are impossible |
--- End Message ---