mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 14:52:05 -05:00
pull: Use 'with-store'.
* guix/scripts/pull.scm (guix-pull): Remove call to 'open-connection'. Use 'with-store' instead.
This commit is contained in:
parent
4902d3c4e0
commit
402e98c524
1 changed files with 21 additions and 21 deletions
|
@ -238,10 +238,10 @@ (define (fetch-tarball store url)
|
||||||
(with-error-handling
|
(with-error-handling
|
||||||
(let* ((opts (parse-command-line args %options
|
(let* ((opts (parse-command-line args %options
|
||||||
(list %default-options)))
|
(list %default-options)))
|
||||||
(store (open-connection))
|
|
||||||
(url (assoc-ref opts 'tarball-url)))
|
(url (assoc-ref opts 'tarball-url)))
|
||||||
(set-build-options-from-command-line store opts)
|
|
||||||
(unless (assoc-ref opts 'dry-run?) ;XXX: not very useful
|
(unless (assoc-ref opts 'dry-run?) ;XXX: not very useful
|
||||||
|
(with-store store
|
||||||
|
(set-build-options-from-command-line store opts)
|
||||||
(let ((tarball
|
(let ((tarball
|
||||||
(if (use-le-certs? url)
|
(if (use-le-certs? url)
|
||||||
(let* ((drv (package-derivation store le-certs))
|
(let* ((drv (package-derivation store le-certs))
|
||||||
|
@ -260,7 +260,7 @@ (define (fetch-tarball store url)
|
||||||
(canonical-package guile-2.0)))))
|
(canonical-package guile-2.0)))))
|
||||||
(run-with-store store
|
(run-with-store store
|
||||||
(build-and-install tarball (config-directory)
|
(build-and-install tarball (config-directory)
|
||||||
#:verbose? (assoc-ref opts 'verbose?)))))))))
|
#:verbose? (assoc-ref opts 'verbose?))))))))))
|
||||||
|
|
||||||
;; Local Variables:
|
;; Local Variables:
|
||||||
;; eval: (put 'with-PATH 'scheme-indent-function 1)
|
;; eval: (put 'with-PATH 'scheme-indent-function 1)
|
||||||
|
|
Loading…
Reference in a new issue