diff options
| -rw-r--r-- | guix/scripts/system/reconfigure.scm | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 8c63921e638..402e6d30fc1 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm | |||
| @@ -407,15 +407,19 @@ to commits of channels in NEW." | |||
| 407 | (channel-name old))) | 407 | (channel-name old))) |
| 408 | new))) | 408 | new))) |
| 409 | (and new | 409 | (and new |
| 410 | (let ((checkout commit relation | 410 | (if (string=? (channel-commit old) (channel-commit new)) |
| 411 | (update-cached-checkout | 411 | (list new |
| 412 | (channel-url new) | 412 | (channel-commit old) (channel-commit new) |
| 413 | #:ref `(commit . ,(channel-commit new)) | 413 | 'self) |
| 414 | #:starting-commit (channel-commit old) | 414 | (let ((checkout commit relation |
| 415 | #:check-out? #f))) | 415 | (update-cached-checkout |
| 416 | (list new | 416 | (channel-url new) |
| 417 | (channel-commit old) (channel-commit new) | 417 | #:ref `(commit . ,(channel-commit new)) |
| 418 | relation))))) | 418 | #:starting-commit (channel-commit old) |
| 419 | #:check-out? #f))) | ||
| 420 | (list new | ||
| 421 | (channel-commit old) (channel-commit new) | ||
| 422 | relation)))))) | ||
| 419 | old)) | 423 | old)) |
| 420 | 424 | ||
| 421 | (define* (check-forward-update #:optional | 425 | (define* (check-forward-update #:optional |