[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: deploy: Error out when the FILE argument is missing.
From: |
guix-commits |
Subject: |
02/10: deploy: Error out when the FILE argument is missing. |
Date: |
Fri, 28 May 2021 05:36:56 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 7243a8c7ecf1421183d01cbd4631191a861376a4
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri May 28 09:56:31 2021 +0200
deploy: Error out when the FILE argument is missing.
* guix/scripts/deploy.scm (guix-deploy): Error out when FILE is false.
---
guix/scripts/deploy.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index 0725fba..bf2e8af 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.
;;;
@@ -156,7 +156,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)
- branch master updated (90e1f9c -> 416f784), guix-commits, 2021/05/28
- 01/10: gnu: intel-mpi-benchmarks: Remove top-level reference to 'openmpi'., guix-commits, 2021/05/28
- 02/10: deploy: Error out when the FILE argument is missing.,
guix-commits <=
- 03/10: scripts: Commands warn when passed zero arguments., guix-commits, 2021/05/28
- 04/10: git-download: 'git-predicate' now ignores deleted files., guix-commits, 2021/05/28
- 05/10: git-download: Support submodules in 'git-predicate'., guix-commits, 2021/05/28
- 06/10: gnu: libraft: Update to 0.10.1, guix-commits, 2021/05/28
- 07/10: import: opam: Generate license for package., guix-commits, 2021/05/28
- 08/10: gnu: tryton: Factor out custom ‘check’ phase., guix-commits, 2021/05/28
- 09/10: gnu: tryton: Use local 'inputs' instead of global '%build-inputs'., guix-commits, 2021/05/28
- 10/10: gnu: tryton: Allow disabling the test suite., guix-commits, 2021/05/28