guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 02/09: reconfigure: Use 'current-channels' to obtain provenance data.
Date: Mon, 29 Aug 2022 18:42:36 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit b08439809f0868a74d0bd0e14d45cb3e5dd46a8c
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Aug 28 23:05:57 2022 +0200

    reconfigure: Use 'current-channels' to obtain provenance data.
    
    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'.
---
 guix/scripts/system/reconfigure.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/guix/scripts/system/reconfigure.scm 
b/guix/scripts/system/reconfigure.scm
index 9ca66687ee..9bd26a39ee 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -34,7 +34,7 @@
   #:use-module (guix monads)
   #:use-module (guix store)
   #:use-module ((guix self) #:select (make-config.scm))
-  #:autoload   (guix describe) (current-profile)
+  #:autoload   (guix describe) (current-channels)
   #:use-module (guix channels)
   #:autoload   (guix git) (update-cached-checkout)
   #:use-module (guix i18n)
@@ -372,8 +372,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)
-        '()))
+    (current-channels))
 
   (when (null? current-channels)
     (warning (G_ "cannot determine provenance for current system~%")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]