me
/
guix
Archived
1
0
Fork 0
Code

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'.
master
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
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/scripts/system/reconfigure.scm
View File

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