From bd00afc41640d1e8025961a62d5590b9144c8b76 Mon Sep 17 00:00:00 2001 From: Cyrill Schenkel Date: Sat, 21 Sep 2013 20:42:55 +0200 Subject: [PATCH] 'guix-pull' requires single return value from 'unpack' (#15428) * guix/scripts/pull.scm (guix-pull): Procedure doesn't require the 'unpack' procedure to return more than one value anymore. --- guix/scripts/pull.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index f3d87a6..c01f163 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -200,15 +200,12 @@ Download and deploy the latest version of Guix.\n")) (if (assoc-ref opts 'verbose?) (current-error-port) (%make-void-port "w")))) - (let*-values (((config-dir) - (config-directory)) - ((source drv) - (unpack store tarball)) - ((source-dir) - (derivation-output-path - (assoc-ref (derivation-outputs drv) "out")))) - (if (show-what-to-build store (list source)) - (if (build-derivations store (list source)) + (let* ((config-dir (config-directory)) + (drv (unpack store tarball)) + (source-dir (derivation-output-path + (assoc-ref (derivation-outputs drv) "out")))) + (if (show-what-to-build store (list drv)) + (if (build-derivations store (list drv)) (let ((latest (string-append config-dir "/latest"))) (add-indirect-root store latest) (switch-symlinks latest source-dir) -- 1.8.4.rc3