ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 06:06:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Fix skip-to-step issue.

Browse source 
When trying to jump to the first step, DONE-STEPS ends-up being null, which
fails the matching condition.

* gnu/installer/steps.scm (skip-to-step): Split matching conditions to handle
the empty DONE-STEPS case properly.
This commit is contained in:
Mathieu Othacehe 2019-04-21 12:06:25 +02:00
parent 9729b6ea2f
commit 33023baac8
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/installer/steps.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -113,16 +113,24 @@ (define (first-step? steps step)
(define* (skip-to-step step result (define* (skip-to-step step result
#:key todo-steps done-steps) #:key todo-steps done-steps)
(match (list todo-steps done-steps) (match todo-steps
(((todo . rest-todo) (prev-done ... last-done)) ((todo . rest-todo)
(if (eq? (installer-step-id todo) (let ((found? (eq? (installer-step-id todo)
(installer-step-id step)) (installer-step-id step))))
(cond
(found?
(run result (run result
#:todo-steps todo-steps #:todo-steps todo-steps
#:done-steps done-steps) #:done-steps done-steps))
((and (not found?)
(null? done-steps))
(error (format #f "Step ~a not found" (installer-step-id step))))
(else
(match done-steps
((prev-done ... last-done)
(skip-to-step step (pop-result result) (skip-to-step step (pop-result result)
#:todo-steps (cons last-done todo-steps) #:todo-steps (cons last-done todo-steps)
#:done-steps prev-done))))) #:done-steps prev-done)))))))))
(define* (run result #:key todo-steps done-steps) (define* (run result #:key todo-steps done-steps)
(match todo-steps (match todo-steps