diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /guix/scripts/deploy.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'guix/scripts/deploy.scm')
| -rw-r--r-- | guix/scripts/deploy.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 0725fba54b..7c62b05d12 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 David Thompson <davet@gnu.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> -;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,10 +125,7 @@ Perform the deployment specified by FILE.\n")) ;; and include a '&message'. However, that message only contains ;; the format string. Thus, special-case it here to avoid ;; displaying a bare format string. - ((cond-expand - (guile-3 - ((exception-predicate &exception-with-kind-and-args) c)) - (else #f)) + (((exception-predicate &exception-with-kind-and-args) c) (raise c)) ((message-condition? c) @@ -156,7 +153,10 @@ Perform the deployment specified by FILE.\n")) (let* ((opts (parse-command-line args %options (list %default-options) #:argument-handler handle-argument)) (file (assq-ref opts 'file)) - (machines (or (and file (load-source-file file)) '()))) + (machines (and file (load-source-file file)))) + (unless file + (leave (G_ "missing deployment file argument~%"))) + (show-what-to-deploy machines) (with-status-verbosity (assoc-ref opts 'verbosity) |