From db3f2b61adfe56d69029ec5f6d962462a50a1f33 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 16 Mar 2017 22:46:43 +0100
Subject: pack: Allow for "-S /opt/foo=".
Reported by Andy Wingo.
* guix/scripts/pack.scm (%options): Use 'string-split' instead of
'string-tokenize'.
---
guix/scripts/pack.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index edeb82fafd..74d4ee6d4d 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -283,9 +283,10 @@ with COMPRESSOR. It can be passed to 'docker load'."
result)))
(option '(#\S "symlink") #t #f
(lambda (opt name arg result)
- (match (string-tokenize arg
- (char-set-complement
- (char-set #\=)))
+ ;; Note: Using 'string-split' allows us to handle empty
+ ;; TARGET (as in "/opt/guile=", meaning that /opt/guile is
+ ;; a symlink to the profile) correctly.
+ (match (string-split arg (char-set #\=))
((source target)
(let ((symlinks (assoc-ref result 'symlinks)))
(alist-cons 'symlinks
--
cgit v1.2.3