[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/09: guix home, system: Use 'leave' to report missing generations.
From: |
guix-commits |
Subject: |
05/09: guix home, system: Use 'leave' to report missing generations. |
Date: |
Thu, 6 Jan 2022 10:41:27 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit a9268216e4f38189d7948cf2ecb51ad2eac7e586
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jan 6 11:25:42 2022 +0100
guix home, system: Use 'leave' to report missing generations.
Fixes <https://issues.guix.gnu.org/50982>.
Reported by Xinglu Chen <public@yoctocell.xyz>.
Fixes a typo ('error' instead of 'leave') introduced in
158032bd7dcc33d17da8091b2319bf59ee9db6a1 and copied in
89e05a695574fdabd76834aba35ad125620b8b5d.
* guix/scripts/system.scm (process-command): Use 'leave', not 'error'.
* guix/scripts/home.scm (process-command): Likewise.
---
guix/scripts/home.scm | 2 +-
guix/scripts/system.scm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm
index afc7d8b39c..9573661856 100644
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@@ -286,7 +286,7 @@ deploy the home environment described by these files.\n")
((describe)
(match (generation-number %guix-home)
(0
- (error (G_ "no home environment generation, nothing to describe~%")))
+ (leave (G_ "no home environment generation, nothing to describe~%")))
(generation
(display-home-environment-generation generation))))
((list-generations)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 62258c1420..98e788c657 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -1321,7 +1321,7 @@ argument list and OPTS is the option alist."
((describe)
(match (generation-number %system-profile)
(0
- (error (G_ "no system generation, nothing to describe~%")))
+ (leave (G_ "no system generation, nothing to describe~%")))
(generation
(display-system-generation generation))))
((search)
- branch master updated (0701efb351 -> af1b5de6d8), guix-commits, 2022/01/06
- 08/09: gnu: guile-next: Update to 3.0.7-d70c1db., guix-commits, 2022/01/06
- 06/09: gnu: gettext: Use gexps for arguments., guix-commits, 2022/01/06
- 07/09: gnu: gettext: Work around Gnulib test failures on armhf-linux., guix-commits, 2022/01/06
- 04/09: upstream: Support updating and fetching 'git-fetch' origins., guix-commits, 2022/01/06
- 01/09: guix hash: Extract file hashing procedures., guix-commits, 2022/01/06
- 09/09: gnu: gfortran-toolchain, gdc-toolchain: Make visible again., guix-commits, 2022/01/06
- 02/09: import: Factorize file hashing., guix-commits, 2022/01/06
- 05/09: guix home, system: Use 'leave' to report missing generations.,
guix-commits <=
- 03/09: refresh: Support non-tarball sources., guix-commits, 2022/01/06