nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts: 'warn-about-old-distro' looks at the age of the running Guix. 

This fixes a discrepancy that could be seen when running:

  sudo guix system …

where 'guix' would warn about the age of root's Guix, even though the
running Guix is the user's, not root's.

* guix/scripts.scm (warn-about-old-distro)[false-if-not-found]: Remove.
Obtain the profile date by calling 'current-profile-date' instead of
stat'ing "current-guix".
This commit is contained in:
Ludovic Courtès 2019-03-17 17:02:15 +01:00
parent cd2e4b2a8d
commit 55da450a1f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
guix/scripts.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Deck Pickard <deck.r.pickard@gmail.com> ;;; Copyright © 2014 Deck Pickard <deck.r.pickard@gmail.com>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; ;;;
@ -27,6 +27,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module ((guix profiles) #:select (%profile-directory)) #:use-module ((guix profiles) #:select (%profile-directory))
#:autoload (guix describe) (current-profile-date)
#:use-module (guix build syscalls) #:use-module (guix build syscalls)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-19) #:use-module (srfi srfi-19)
@ -158,25 +159,14 @@ Show what and how will/would be built."
#:key (suggested-command #:key (suggested-command
"guix package -u")) "guix package -u"))
"Emit a warning if Guix is older than OLD seconds." "Emit a warning if Guix is older than OLD seconds."
(let-syntax ((false-if-not-found
(syntax-rules ()
((_ exp)
(catch 'system-error
(lambda ()
exp)
(lambda args
(if (= ENOENT (system-error-errno args))
#f
(apply throw args))))))))
(define (seconds->days seconds) (define (seconds->days seconds)
(round (/ seconds (* 3600 24)))) (round (/ seconds (* 3600 24))))
(define age (define age
(match (false-if-not-found (match (current-profile-date)
(lstat (string-append %profile-directory "/current-guix")))
(#f #f) (#f #f)
(stat (- (time-second (current-time time-utc)) (date (- (time-second (current-time time-utc))
(stat:mtime stat))))) date))))
(when (and age (>= age old)) (when (and age (>= age old))
(warning (N_ "Your Guix installation is ~a day old.\n" (warning (N_ "Your Guix installation is ~a day old.\n"
@ -187,7 +177,7 @@ Show what and how will/would be built."
(warning (G_ "Consider running 'guix pull' followed by (warning (G_ "Consider running 'guix pull' followed by
'~a' to get up-to-date packages and security updates.\n") '~a' to get up-to-date packages and security updates.\n")
suggested-command) suggested-command)
(newline (guix-warning-port))))) (newline (guix-warning-port))))
(define %disk-space-warning (define %disk-space-warning
;; The fraction (between 0 and 1) of free disk space below which a warning ;; The fraction (between 0 and 1) of free disk space below which a warning