me
/
guix
Archived
1
0
Fork 0
Code

emacs: Use 'with-store' in 'process-package-actions'. 

* emacs/guix-main.scm (process-package-actions): Use 'with-store'.
master
Alex Kost 2014-10-05 23:52:52 +04:00
parent 75af27f764
commit 1f06b28899
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
emacs/guix-main.scm
View File

@ -790,31 +790,31 @@ OUTPUTS is a list of package outputs (may be an empty list)."
(new-manifest (manifest-perform-transaction (new-manifest (manifest-perform-transaction
manifest transaction))) manifest transaction)))
(unless (and (null? install) (null? remove)) (unless (and (null? install) (null? remove))
(let* ((store (open-connection)) (with-store store
(derivation (run-with-store (let* ((derivation (run-with-store store
store (profile-derivation new-manifest))) (profile-derivation new-manifest)))
(derivations (list derivation)) (derivations (list derivation))
(new-profile (derivation->output-path derivation))) (new-profile (derivation->output-path derivation)))
(set-build-options store (set-build-options store
#:use-substitutes? use-substitutes?) #:use-substitutes? use-substitutes?)
(manifest-show-transaction store manifest transaction (manifest-show-transaction store manifest transaction
#:dry-run? dry-run?) #:dry-run? dry-run?)
(show-what-to-build store derivations (show-what-to-build store derivations
#:use-substitutes? use-substitutes? #:use-substitutes? use-substitutes?
#:dry-run? dry-run?) #:dry-run? dry-run?)
(unless dry-run? (unless dry-run?
(let ((name (generation-file-name (let ((name (generation-file-name
profile profile
(+ 1 (generation-number profile))))) (+ 1 (generation-number profile)))))
(and (build-derivations store derivations) (and (build-derivations store derivations)
(let* ((entries (manifest-entries new-manifest)) (let* ((entries (manifest-entries new-manifest))
(count (length entries))) (count (length entries)))
(switch-symlinks name new-profile) (switch-symlinks name new-profile)
(switch-symlinks profile name) (switch-symlinks profile name)
(format #t (N_ "~a package in profile~%" (format #t (N_ "~a package in profile~%"
"~a packages in profile~%" "~a packages in profile~%"
count) count)
count))))))))) count))))))))))
(define (delete-generations* profile generations) (define (delete-generations* profile generations)
"Delete GENERATIONS from PROFILE. "Delete GENERATIONS from PROFILE.