From 92ca25a32b4bd19cda563fa0807af0fa2d39e0e2 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 19 Jul 2019 11:38:54 +0200
Subject: guix archive: Use (gcrypt common).

* guix/scripts/archive.scm: Use (gcrypt common) for 'error-source' and
'error-string'.
---
 guix/scripts/archive.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'guix/scripts')

diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index d349b5d590..fba0f73826 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -30,6 +30,7 @@
   #:use-module (guix monads)
   #:use-module (guix ui)
   #:use-module (guix pki)
+  #:use-module (gcrypt common)
   #:use-module (gcrypt pk-crypto)
   #:use-module (guix scripts)
   #:use-module (guix scripts build)
-- 
cgit v1.2.3


From 3d33c93cef67d88bdc9409959f3c1f3857af09cf Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 20 Jul 2019 01:31:38 +0200
Subject: lint: Use the 'warning' procedure for messages.

* guix/scripts/lint.scm (emit-warnings): Use 'warning' instead of
'format'.
---
 guix/scripts/lint.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'guix/scripts')

diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 98ee469501..ee1c826d2e 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -46,10 +46,9 @@
    (lambda (lint-warning)
      (let ((package (lint-warning-package lint-warning))
            (loc     (lint-warning-location lint-warning)))
-       (format (guix-warning-port) "~a: ~a@~a: ~a~%"
-               (location->string loc)
-               (package-name package) (package-version package)
-               (lint-warning-message lint-warning))))
+       (warning loc (G_ "~a@~a: ~a~%")
+                (package-name package) (package-version package)
+                (lint-warning-message lint-warning))))
    warnings))
 
 (define (run-checkers package checkers)
-- 
cgit v1.2.3


From cd9f56ff5a0c187eb9d931713cb6774564163788 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 22 Jul 2019 00:45:42 +0200
Subject: pack: Pass a list as the entry point for 'build-docker-image'.

* guix/scripts/pack.scm (docker-image)[build]: Pass a list as
 #:entry-point, not a string.
---
 guix/scripts/pack.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'guix/scripts')

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 4ac5dfc896..01472d9768 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -509,9 +509,10 @@ the image."
                                 #:database #+database
                                 #:system (or #$target (utsname:machine (uname)))
                                 #:environment environment
-                                #:entry-point #$(and entry-point
-                                                     #~(string-append #$profile "/"
-                                                                      #$entry-point))
+                                #:entry-point
+                                #$(and entry-point
+                                       #~(list (string-append #$profile "/"
+                                                              #$entry-point)))
                                 #:symlinks '#$symlinks
                                 #:compressor '#$(compressor-command compressor)
                                 #:creation-time (make-time time-utc 0 1))))))
-- 
cgit v1.2.3