Package: guix-patches;
Reported by: "(" <paren <at> disroot.org>
Date: Sun, 7 Aug 2022 11:15:02 UTC
Severity: normal
Tags: patch
View this message in rfc822 format
From: "(" <paren <at> disroot.org>
To: 57031 <at> debbugs.gnu.org
Cc: "\(" <paren <at> disroot.org>
Subject: [bug#57031] [PATCH v2 2/2] scripts: Warn the first time pull or package is run as root.
Date: Sun, 11 Sep 2022 20:59:41 +0100
* guix/scripts/pull.scm (guix-pull): Warn the first time it's being
run as root.
* guix/scripts/package.scm (guix-package*): Likewise if the new
`root-hint?' argument is `#t'.
(guix-package): Use `#:root-hint? #t' in invocation of `guix-package*'.
* guix/scripts/install.scm (guix-install): Likewise.
* guix/scripts/remove.scm (guix-remove): Likewise.
* guix/scripts/remove.scm (guix-upgrade): Likewise.
A pretty common beginner mistake, it seems, is assuming that since
every other package manager you've used requires root for installing,
removing, and upgrading packages, Guix must too.
This commit tries to make it harder to make such an assumption, by
making commands such as `pull`, `package`, and `upgrade` display
a warning the first time they are run as root.
---
guix/scripts/install.scm | 3 ++-
guix/scripts/package.scm | 15 ++++++++++++---
guix/scripts/pull.scm | 6 ++++++
guix/scripts/remove.scm | 3 ++-
guix/scripts/upgrade.scm | 3 ++-
5 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/guix/scripts/install.scm b/guix/scripts/install.scm
index 63e625f266..bf11fc7b11 100644
--- a/guix/scripts/install.scm
+++ b/guix/scripts/install.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -80,4 +81,4 @@ (define opts
(list %package-default-options #f)
#:argument-handler handle-argument))
- (guix-package* opts))
+ (guix-package* opts #:root-hint? #t))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 7ba2661bbb..7379e69388 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2018 Steve Sprang <scs <at> stevesprang.com>
;;; Copyright © 2022 Josselin Poiret <dev <at> jpoiret.xyz>
;;; Copyright © 2022 Antero Mejr <antero <at> mailbox.org>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1079,12 +1080,20 @@ (define opts
(parse-command-line args %options (list %default-options #f)
#:argument-handler handle-argument))
- (guix-package* opts))
+ (guix-package* opts #:root-hint? #t))
-(define (guix-package* opts)
+(define* (guix-package* opts #:key (root-hint? #f))
"Run the 'guix package' command on OPTS, an alist resulting for command-line
-option processing with 'parse-command-line'."
+option processing with 'parse-command-line'. If ROOT-HINT? is #T, a hint is
+shown on the first usage of this procedure that informs users about Guix's
+support for per-user package management."
(with-error-handling
+ (when (and root-hint?
+ (not (hint-given? 'package-root-hint))
+ (zero? (getuid)))
+ (record-hint 'package-root-hint)
+ (warning (G_ "this command is user-specific, so running it as root \
+will affect only the 'root' user~%")))
(or (process-query opts)
(parameterize ((%store (open-connection))
(%graft? (assoc-ref opts 'graft?)))
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 19224cf70b..188b632450 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013-2015, 2017-2022 Ludovic Courtès <ludo <at> gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke <at> fastmail.com>
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -827,6 +828,11 @@ (define (no-arguments arg _)
(leave (G_ "~A: extraneous argument~%") arg))
(with-error-handling
+ (when (and (not (hint-given? 'pull-root-hint))
+ (zero? (getuid)))
+ (record-hint 'pull-root-hint)
+ (warning (G_ "this command is user-specific, so running it as root \
+will affect only the 'root' user~%")))
(with-git-error-handling
(let* ((opts (parse-command-line args %options
(list %default-options)
diff --git a/guix/scripts/remove.scm b/guix/scripts/remove.scm
index a46ad04d56..131649eace 100644
--- a/guix/scripts/remove.scm
+++ b/guix/scripts/remove.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -76,4 +77,4 @@ (define opts
(list %package-default-options #f)
#:argument-handler handle-argument))
- (guix-package* opts))
+ (guix-package* opts #:root-hint? #t))
diff --git a/guix/scripts/upgrade.scm b/guix/scripts/upgrade.scm
index beb59cbe6f..dd14600fe4 100644
--- a/guix/scripts/upgrade.scm
+++ b/guix/scripts/upgrade.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo <at> gnu.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -87,4 +88,4 @@ (define opts
#f)
#:argument-handler handle-argument))
- (guix-package* opts))
+ (guix-package* opts #:root-hint? #t))
--
2.37.3
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.