From e6ea74d86c628c6b5365b69e23c3e5ef3e15c336 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Oct 2019 11:07:21 +0200 Subject: pull: Call 'ensure-default-profile' after 'set-build-options'. This is a followup to 81c580c8664bfeeb767e2c47ea343004e88223c7. * guix/scripts/pull.scm (guix-pull): Move 'ensure-default-profile' call after 'set-build-options-from-command-line' call. This ensures that the 'profiles/per-user/$USER' directory is created before 'ensure-default-profile' is called when 'GUIX_DAEMON_SOCKET' points to a remote TCP daemon. --- guix/scripts/pull.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/scripts') diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 04970cf503..7876019eac 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -772,11 +772,11 @@ Use '~/.config/guix/channels.scm' instead.")) (process-generation-change opts profile)) (else (with-store store - (ensure-default-profile) (with-status-verbosity (assoc-ref opts 'verbosity) (parameterize ((%current-system (assoc-ref opts 'system)) (%graft? (assoc-ref opts 'graft?))) (set-build-options-from-command-line store opts) + (ensure-default-profile) (honor-x509-certificates store) (let ((instances (latest-channel-instances store channels))) -- cgit v1.2.3