reconfigure: Use 'current-channels' to obtain provenance data.
This reinstates a modified version ofmasterb08439809f
, 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 to316fc2acbb
. * guix/scripts/system/reconfigure.scm (check-forward-update): Use 'current-channels' rather than 'current-profile' + 'profile-channels'.
parent
36445e4d96
commit
270e1b9e1e
|
@ -34,7 +34,6 @@
|
|||
#: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 @@ currently-deployed commit (from CURRENT-CHANNELS, which is as returned by
|
|||
'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~%")))
|
||||
|
|
Reference in New Issue