mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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.
This commit is contained in:
parent
05962f2958
commit
47e643db10
1 changed files with 4 additions and 4 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue