~ruther/guix-local

47e643db107d4c4569fe2195c5369d748169ae47 — Ludovic Courtès 11 years ago 05962f2
guix-register: Do not attempt to create NIX_STORE_DIR.

Fixes <http://bugs.gnu.org/18689>.
Reported by Philip Woods <elzairthesorcerer@gmail.com>.

* nix/guix-register/guix-register.cc (main): Move 'store' instantiation
  above 'settings.nixStore' assignment.
1 files changed, 4 insertions(+), 4 deletions(-)

M nix/guix-register/guix-register.cc
M nix/guix-register/guix-register.cc => nix/guix-register/guix-register.cc +4 -4
@@ 224,16 224,16 @@ main (int argc, char *argv[])
    {
      argp_parse (&argp, argc, argv, 0, 0, 0);

      /* Instantiate the store.  This creates any missing directories among
	 'settings.nixStore', 'settings.nixDBPath', etc.  */
      LocalStore store;

      if (!prefix.empty ())
	/* Under the --prefix tree, the final name of the store will be
	   NIX_STORE_DIR.  Set it here so that the database uses file names
	   prefixed by NIX_STORE_DIR and not PREFIX + NIX_STORE_DIR.  */
	settings.nixStore = NIX_STORE_DIR;

      /* Instantiate the store.  This creates any missing directories among
	 'settings.nixStore', 'settings.nixDBPath', etc.  */
      LocalStore store;

      register_validity (&store, *input, deduplication);
    }
  catch (std::exception &e)