>From 51d776e94b34351bf09620d05fe3a6a1dfafc0ee Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 21 Sep 2014 14:25:56 +0400 Subject: [PATCH 2/2] guix package: Use 'profile-generations'. * guix/scripts/package.scm (guix-package)[process-actions]: Use 'profile-generations' instead of the equivalent code. --- guix/scripts/package.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 95c0130..7cd9516 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -716,12 +716,9 @@ more information.~%")) (leave (_ "profile '~a' does not exist~%") profile)) ((string-null? pattern) - (let ((numbers (generation-numbers profile))) - (if (equal? numbers '(0)) - (exit 0) - (for-each display-and-delete - (delete current-generation-number - numbers))))) + (for-each display-and-delete + (delete current-generation-number + (profile-generations profile)))) ;; Do not delete the zeroth generation. ((equal? 0 (string->number pattern)) (exit 0)) @@ -828,11 +825,7 @@ more information.~%")) (leave (_ "profile '~a' does not exist~%") profile)) ((string-null? pattern) - (let ((numbers (generation-numbers profile))) - (leave-on-EPIPE - (if (equal? numbers '(0)) - (exit 0) - (for-each list-generation numbers))))) + (for-each list-generation (profile-generations profile))) ((matching-generations pattern profile) => (lambda (numbers) -- 2.1.0