From 3698f524d5d1777aebec653c444783800a70417a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 21 Jan 2015 19:31:10 +0100
Subject: [PATCH] store: Change 'run-with-store' to return a single value.

* guix/store.scm (run-with-store): Wrap 'run-with-state' in
  'call-with-values'.  Return only the first value.
---
 guix/store.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/guix/store.scm b/guix/store.scm
index 63425b3023..a12abc8671 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -917,10 +917,14 @@ permission bits are kept."
                          (guile-for-build (%guile-for-build))
                          (system (%current-system)))
   "Run MVAL, a monadic value in the store monad, in STORE, an open store
-connection."
+connection, and return the result."
   (parameterize ((%guile-for-build guile-for-build)
                  (%current-system system))
-    (run-with-state mval store)))
+    (call-with-values (lambda ()
+                        (run-with-state mval store))
+      (lambda (result store)
+        ;; Discard the state.
+        result))))
 
 
 ;;;