[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: pack: Fix 'guix pack -f docker'.
From: |
guix-commits |
Subject: |
06/06: pack: Fix 'guix pack -f docker'. |
Date: |
Mon, 10 Jun 2019 17:30:04 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit c5f66d29311031d59424dd470ae6c3a315a79712
Author: Ludovic Courtès <address@hidden>
Date: Mon Jun 10 23:16:47 2019 +0200
pack: Fix 'guix pack -f docker'.
Regression introduced in a0f352b30f4869a7af7017b8a5011ac7602dd115.
* guix/scripts/pack.scm (docker-image): Check whether ENTRY-POINT is
true before returning (string-append #$profile ...).
---
guix/scripts/pack.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 5da23e0..c90b777 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -455,8 +455,9 @@ the image."
#$profile
#:database #+database
#:system (or #$target (utsname:machine
(uname)))
- #:entry-point (string-append #$profile "/"
- #$entry-point)
+ #:entry-point #$(and entry-point
+ #~(string-append
#$profile "/"
+
#$entry-point))
#:symlinks '#$symlinks
#:compressor '#$(compressor-command compressor)
#:creation-time (make-time time-utc 0 1))))))
- branch master updated (aec9bb8 -> c5f66d2), guix-commits, 2019/06/10
- 04/06: artwork: Update snapshot to 2f2fe74., guix-commits, 2019/06/10
- 06/06: pack: Fix 'guix pack -f docker'.,
guix-commits <=
- 05/06: services: slim: Update SLiM theme to 1.x., guix-commits, 2019/06/10
- 03/06: store: 'build-things' accepts derivation/output pairs., guix-commits, 2019/06/10
- 01/06: download: Update list of content-addressed mirrors., guix-commits, 2019/06/10
- 02/06: ssh: Add missing import., guix-commits, 2019/06/10