me
/
guix
Archived
1
0
Fork 0
Code

time-machine: Handle 'git-error' exceptions. 

* guix/scripts/pull.scm (with-git-error-handling): Export.
* guix/scripts/time-machine.scm (guix-time-machine): Wrap body in
'with-git-error-handling'.
master
Ludovic Courtès 2019-11-15 21:11:58 +01:00
parent 067305977c
commit d17e012da7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
guix/scripts/pull.scm
View File

@ -57,6 +57,7 @@
#:use-module (ice-9 format)
#:export (display-profile-content
channel-list
with-git-error-handling
guix-pull))

20
guix/scripts/time-machine.scm
View File

@ -22,7 +22,8 @@
#:use-module (guix inferior)
#:use-module (guix channels)
#:use-module (guix store)
#:use-module ((guix scripts pull) #:select (channel-list))
#:use-module ((guix scripts pull)
#:select (with-git-error-handling channel-list))
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
@ -94,11 +95,12 @@ Execute COMMAND ARGS... in an older version of Guix.\n"))
(define (guix-time-machine . args)
(with-error-handling
(let* ((opts (parse-args args))
(channels (channel-list opts))
(command-line (assoc-ref opts 'exec)))
(when command-line
(let* ((directory (with-store store
(cached-channel-instance store channels)))
(executable (string-append directory "/bin/guix")))
(apply execl (cons* executable executable command-line)))))))
(with-git-error-handling
(let* ((opts (parse-args args))
(channels (channel-list opts))
(command-line (assoc-ref opts 'exec)))
(when command-line
(let* ((directory (with-store store
(cached-channel-instance store channels)))
(executable (string-append directory "/bin/guix")))
(apply execl (cons* executable executable command-line))))))))