diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-10-18 11:07:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-18 12:02:52 +0200 |
| commit | e6ea74d86c628c6b5365b69e23c3e5ef3e15c336 (patch) | |
| tree | 142c31a2eebdb096499bbb694b5f1b0076aa99b1 | |
| parent | 63729d92774a07c66c06010fee4a6e6a138b277a (diff) | |
| download | patches-e6ea74d86c628c6b5365b69e23c3e5ef3e15c336.tar patches-e6ea74d86c628c6b5365b69e23c3e5ef3e15c336.tar.gz | |
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.
| -rw-r--r-- | guix/scripts/pull.scm | 2 |
1 files changed, 1 insertions, 1 deletions
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))) |