[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/12: pack: Allow for "-S /opt/foo=".
From: |
Ludovic Courtès |
Subject: |
10/12: pack: Allow for "-S /opt/foo=". |
Date: |
Thu, 16 Mar 2017 18:04:25 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit db3f2b61adfe56d69029ec5f6d962462a50a1f33
Author: Ludovic Courtès <address@hidden>
Date: Thu Mar 16 22:46:43 2017 +0100
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 edeb82f..74d4ee6 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
- branch master updated (2c715a9 -> ad172c4), Ludovic Courtès, 2017/03/16
- 05/12: pack: Honor command-line options related to the store., Ludovic Courtès, 2017/03/16
- 02/12: gexp: Add '=>' syntax to import computed modules., Ludovic Courtès, 2017/03/16
- 03/12: services: connman: Rework service., Ludovic Courtès, 2017/03/16
- 04/12: memoization: Micro-optimize code produced by 'define-cache-procedure'., Ludovic Courtès, 2017/03/16
- 07/12: pack: Use a fixed timestamp in Docker images., Ludovic Courtès, 2017/03/16
- 01/12: utils: Move base16 procedures to (guix base16)., Ludovic Courtès, 2017/03/16
- 09/12: pack: Honor symlinks in the Docker back-end., Ludovic Courtès, 2017/03/16
- 11/12: doc: Mention 'guix pack' reproducibility., Ludovic Courtès, 2017/03/16
- 10/12: pack: Allow for "-S /opt/foo=".,
Ludovic Courtès <=
- 12/12: doc: Reorganize categories., Ludovic Courtès, 2017/03/16
- 06/12: pack: Add '--format' option and Docker output support., Ludovic Courtès, 2017/03/16
- 08/12: docker: Build images in a reproducible fashion., Ludovic Courtès, 2017/03/16