diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-08-28 23:05:57 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-08-31 11:40:06 +0200 |
| commit | 270e1b9e1ea2b3e41067a38b094b0656ceb56838 (patch) | |
| tree | 898664ff78acca73b5cb914773a4c1c0ba307e7a /guix | |
| parent | 36445e4d9625253aef461aa993ba134abb1df7cc (diff) | |
| download | guix-patches-270e1b9e1ea2b3e41067a38b094b0656ceb56838.tar guix-patches-270e1b9e1ea2b3e41067a38b094b0656ceb56838.tar.gz | |
reconfigure: Use 'current-channels' to obtain provenance data.
This reinstates a modified version of
b08439809f0868a74d0bd0e14d45cb3e5dd46a8c, 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 316fc2acbb112bfa572ae30f95a93bcd56621234.
* guix/scripts/system/reconfigure.scm (check-forward-update): Use
'current-channels' rather than 'current-profile' + 'profile-channels'.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/system/reconfigure.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 9ca66687ee..afd410d4bc 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -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~%"))) |