summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-10-01 11:49:17 +0200
committerLudovic Courtès <ludo@gnu.org>2019-10-01 12:06:00 +0200
commit0cf2b6f2dbcd299f7a4b7a563cf34ae5de154b15 (patch)
tree0b653bb411222fda1d159cb05bee722ff8bac9cc /guix/scripts
parent8d564b8b81b98fec9aac2f5f2d3cb0d1f2ea1416 (diff)
parent717b6ba6aa9ac876b2c2df36096e4579b19ee06c (diff)
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/offload.scm3
-rw-r--r--guix/scripts/pull.scm2
2 files changed, 3 insertions, 2 deletions
diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index 0c0dd9d516..bb307cefd1 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -243,7 +243,8 @@ instead of '~a' of type '~a'~%")
;; of these; if we fail, that means all the build slots are already taken.
;; Inspired by Nix's build-remote.pl.
(string-append (string-append %state-directory "/offload/"
- (build-machine-name machine)
+ (build-machine-name machine) ":"
+ (number->string (build-machine-port machine))
"/" (number->string slot))))
(define (acquire-build-slot machine)
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 0372278705..e018985469 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -304,7 +304,7 @@ to display."
(new
(let ((count (length new)))
(format (current-error-port)
- (N_ " ~*One new channel:~%"
+ (N_ " ~a new channel:~%"
" ~a new channels:~%" count)
count)
(for-each display-channel new))))