reconfigure: Use 'current-channels' to obtain provenance data.

This reinstates a modified version of
b08439809f, which contained a thinko.

Previously, build-time metadata from (guix config) would be ignored when
available--e.g., when running /run/current-system/profile/bin/guix.

This is a followup to 316fc2acbb.

* guix/scripts/system/reconfigure.scm (check-forward-update): Use
'current-channels' rather than 'current-profile' + 'profile-channels'.
This commit is contained in:
Ludovic Courtès 2022-08-28 23:05:57 +02:00
parent 36445e4d96
commit 270e1b9e1e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -34,7 +34,6 @@ (define-module (guix scripts system reconfigure)
#:use-module (guix monads)
#:use-module (guix store)
#:use-module ((guix self) #:select (make-config.scm))
#:autoload (guix describe) (current-profile)
#:use-module (guix channels)
#:autoload (guix git) (update-cached-checkout)
#:use-module (guix i18n)
@ -372,8 +371,7 @@ (define* (check-forward-update #:optional
'guix system describe' by default) and the target commit (as returned by 'guix
describe')."
(define new
(or (and=> (current-profile) profile-channels)
'()))
((@ (guix describe) current-channels)))
(when (null? current-channels)
(warning (G_ "cannot determine provenance for current system~%")))