From 689142cd759457f375230a00dc719ddc00dc2fe4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Jul 2014 11:03:50 +0200 Subject: guix-register: Add '--state-directory' parameter. * nix/guix-register/guix-register.cc (GUIX_OPT_STATE_DIRECTORY): New macro. (parse_opt): Honor it. * tests/guix-register.sh: Add test with '--state-directory'. * guix/store.scm (register-path): Add #:state-directory parameter. --- guix/store.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'guix/store.scm') diff --git a/guix/store.scm b/guix/store.scm index 8c774a6db2..79dcf22cca 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -797,11 +797,14 @@ (define ordered (loop tail))))))) (define* (register-path path - #:key (references '()) deriver prefix) + #:key (references '()) deriver prefix + state-directory) "Register PATH as a valid store file, with REFERENCES as its list of references, and DERIVER as its deriver (.drv that led to it.) If PREFIX is not #f, it must be the name of the directory containing the new store to -initialize. Return #t on success. +initialize; if STATE-DIRECTORY is not #f, it must be a string containing the +absolute file name to the state directory of the store being initialized. +Return #t on success. Use with care as it directly modifies the store! This is primarily meant to be used internally by the daemon's build hook." @@ -809,9 +812,12 @@ (define* (register-path path (catch 'system-error (lambda () (let ((pipe (apply open-pipe* OPEN_WRITE %guix-register-program - (if prefix - `("--prefix" ,prefix) - '())))) + `(,@(if prefix + `("--prefix" ,prefix) + '()) + ,@(if state-directory + `("--state-directory" ,state-directory) + '()))))) (and pipe (begin (format pipe "~a~%~a~%~a~%" -- cgit v1.2.3