* Refactoring. There is now an abstract interface class StoreAPI

  containing functions that operate on the Nix store.  One
  implementation is LocalStore, which operates on the Nix store
  directly.  The next step, to enable secure multi-user Nix, is to
  create a different implementation RemoteStore that talks to a
  privileged daemon process that uses LocalStore to perform the actual
  operations.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index d135691a1..33576d69c 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -1,7 +1,7 @@
 #include "shared.hh"
 #include "globals.hh"
 #include "gc.hh"
-#include "store.hh"
+#include "store-api.hh"
 #include "util.hh"
 
 #include "config.h"
@@ -199,7 +199,8 @@ static void initAndRun(int argc, char * * argv)
 
     run(remaining);
 
-    closeDB(); /* it's fine if the DB isn't actually open */
+    /* Close the Nix database. */
+    store.reset((StoreAPI *) 0);
 }