diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-04-06 21:27:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-06 21:27:35 +0200 |
| commit | 250bc998ac9d456f70c675579020d7173f87f3c3 (patch) | |
| tree | 4a934f94c6b65a2f138e16fb4d783e6ea8200175 | |
| parent | d26eb84d140af8d2119509d7da440b4f035608c5 (diff) | |
| download | guix-patches-250bc998ac9d456f70c675579020d7173f87f3c3.tar guix-patches-250bc998ac9d456f70c675579020d7173f87f3c3.tar.gz | |
guix package: Avoid 'exit' calls in 'delete-matching-generations'.
* guix/scripts/package.scm (delete-matching-generations): Remove call to
'exit' when PATTERN is "0". Call 'leave' instead of 'exit'
when (null-list? number).
| -rw-r--r-- | guix/scripts/package.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 3a7afb724b..6190f3286d 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -246,7 +246,7 @@ denote ranges as interpreted by 'matching-derivations'." (delv current (profile-generations profile)))) ;; Do not delete the zeroth generation. ((equal? 0 (string->number pattern)) - (exit 0)) + #t) ;; If PATTERN is a duration, match generations that are ;; older than the specified duration. @@ -261,9 +261,9 @@ denote ranges as interpreted by 'matching-derivations'." ;; Make sure we don't inadvertently remove the current ;; generation. (let ((numbers (delv current numbers))) - (if (null-list? numbers) - (exit 1) - (delete-generations (%store) profile numbers))))) + (when (null-list? numbers) + (leave (_ "no matching generation~%"))) + (delete-generations (%store) profile numbers)))) (else (leave (_ "invalid syntax: ~a~%") pattern))))) |