[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: scripts: 'warn-about-old-distro' looks at the age of the running
From: |
guix-commits |
Subject: |
02/08: scripts: 'warn-about-old-distro' looks at the age of the running Guix. |
Date: |
Sun, 17 Mar 2019 17:55:11 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 55da450a1fc9969d9e791d7d94da90df3aa284db
Author: Ludovic Courtès <address@hidden>
Date: Sun Mar 17 17:02:15 2019 +0100
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".
---
guix/scripts.scm | 50 ++++++++++++++++++++------------------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/guix/scripts.scm b/guix/scripts.scm
index 5e20ecd..75d801a 100644
--- a/guix/scripts.scm
+++ b/guix/scripts.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014 Deck Pickard <address@hidden>
;;; Copyright © 2015, 2016 Alex Kost <address@hidden>
;;;
@@ -27,6 +27,7 @@
#:use-module (guix packages)
#:use-module (guix derivations)
#:use-module ((guix profiles) #:select (%profile-directory))
+ #:autoload (guix describe) (current-profile-date)
#:use-module (guix build syscalls)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-19)
@@ -158,36 +159,25 @@ Show what and how will/would be built."
#:key (suggested-command
"guix package -u"))
"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)
- (round (/ seconds (* 3600 24))))
-
- (define age
- (match (false-if-not-found
- (lstat (string-append %profile-directory "/current-guix")))
- (#f #f)
- (stat (- (time-second (current-time time-utc))
- (stat:mtime stat)))))
-
- (when (and age (>= age old))
- (warning (N_ "Your Guix installation is ~a day old.\n"
- "Your Guix installation is ~a days old.\n"
- (seconds->days age))
- (seconds->days age)))
- (when (or (not age) (>= age old))
- (warning (G_ "Consider running 'guix pull' followed by
+ (define (seconds->days seconds)
+ (round (/ seconds (* 3600 24))))
+
+ (define age
+ (match (current-profile-date)
+ (#f #f)
+ (date (- (time-second (current-time time-utc))
+ date))))
+
+ (when (and age (>= age old))
+ (warning (N_ "Your Guix installation is ~a day old.\n"
+ "Your Guix installation is ~a days old.\n"
+ (seconds->days age))
+ (seconds->days age)))
+ (when (or (not age) (>= age old))
+ (warning (G_ "Consider running 'guix pull' followed by
'~a' to get up-to-date packages and security updates.\n")
- suggested-command)
- (newline (guix-warning-port)))))
+ suggested-command)
+ (newline (guix-warning-port))))
(define %disk-space-warning
;; The fraction (between 0 and 1) of free disk space below which a warning
- branch master updated (19c0cdb -> d831b19), guix-commits, 2019/03/17
- 06/08: guix build: Transformation options match packages by spec., guix-commits, 2019/03/17
- 04/08: packages: Add 'package-input-rewriting/spec'., guix-commits, 2019/03/17
- 08/08: guix build: '--with-branch' strips slashes from the version string., guix-commits, 2019/03/17
- 07/08: guix build: '--with-commit' makes recursive checkouts., guix-commits, 2019/03/17
- 03/08: guix build: Add '--with-git-url'., guix-commits, 2019/03/17
- 05/08: guix build: Factorize 'package-git-url'., guix-commits, 2019/03/17
- 02/08: scripts: 'warn-about-old-distro' looks at the age of the running Guix.,
guix-commits <=
- 01/08: describe: Add 'current-profile-date'., guix-commits, 2019/03/17