me/guix
Archived
1
0
Fork 0
Code Activity

pull: Call 'ensure-default-profile' after 'set-build-options'.

Browse source 
This is a followup to 81c580c866.

* 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.
This commit is contained in:
Ludovic Courtès 2019-10-18 11:07:21 +02:00
parent 63729d9277
commit e6ea74d86c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
guix/scripts/pull.scm
View file

@ -772,11 +772,11 @@ Use '~/.config/guix/channels.scm' instead."))
(process-generation-change opts profile)) (process-generation-change opts profile))
(else (else
(with-store store (with-store store
(ensure-default-profile)
(with-status-verbosity (assoc-ref opts 'verbosity) (with-status-verbosity (assoc-ref opts 'verbosity)
(parameterize ((%current-system (assoc-ref opts 'system)) (parameterize ((%current-system (assoc-ref opts 'system))
(%graft? (assoc-ref opts 'graft?))) (%graft? (assoc-ref opts 'graft?)))
(set-build-options-from-command-line store opts) (set-build-options-from-command-line store opts)
(ensure-default-profile)
(honor-x509-certificates store) (honor-x509-certificates store)
(let ((instances (latest-channel-instances store channels))) (let ((instances (latest-channel-instances store channels)))