From 619c9522b2d6d7c451f90524c3a041c5fb12c28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 14 Jan 2015 18:20:01 +0100
Subject: [PATCH] check-available-binaries: Use 'with-store'.

* build-aux/check-available-binaries.scm: Use 'with-store' instead of an
  explicit 'open-connection'.
---
 build-aux/check-available-binaries.scm | 48 +++++++++++++-------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm
index 74a43ff1d8..ebe94d2f7f 100644
--- a/build-aux/check-available-binaries.scm
+++ b/build-aux/check-available-binaries.scm
@@ -28,28 +28,28 @@
              (srfi srfi-1)
              (srfi srfi-26))
 
-(let* ((store  (open-connection))
-       (native (append-map (lambda (system)
-                             (map (cut package-derivation store <> system)
-                                  (list %bootstrap-tarballs emacs)))
-                           %supported-systems))
-       (cross  (map (cut package-cross-derivation store
-                         %bootstrap-tarballs <>)
-                    '("mips64el-linux-gnuabi64")))
-       (total  (append native cross)))
-  (define (warn proc)
-    (lambda (drv)
-      (or (proc drv)
-          (begin
-            (format (current-error-port) "~a is not substitutable~%"
-                    drv)
-            #f))))
+(with-store store
+  (let* ((native (append-map (lambda (system)
+                               (map (cut package-derivation store <> system)
+                                    (list %bootstrap-tarballs emacs)))
+                             %supported-systems))
+         (cross  (map (cut package-cross-derivation store
+                           %bootstrap-tarballs <>)
+                      '("mips64el-linux-gnuabi64")))
+         (total  (append native cross)))
+    (define (warn proc)
+      (lambda (drv)
+        (or (proc drv)
+            (begin
+              (format (current-error-port) "~a is not substitutable~%"
+                      drv)
+              #f))))
 
-  (set-build-options store #:use-substitutes? #t)
-  (let ((result (every (compose (warn (cut has-substitutes? store <>))
-                                derivation->output-path)
-                       total)))
-    (when result
-      (format (current-error-port) "~a packages found substitutable~%"
-              (length total)))
-    (exit result)))
+    (set-build-options store #:use-substitutes? #t)
+    (let ((result (every (compose (warn (cut has-substitutes? store <>))
+                                  derivation->output-path)
+                         total)))
+      (when result
+        (format (current-error-port) "~a packages found substitutable~%"
+                (length total)))
+      (exit result))))