guix-commits
[Top][All Lists]
Advanced

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

01/02: Revert "guix gc: '--delete-generations' now deletes old Home gene


From: guix-commits
Subject: 01/02: Revert "guix gc: '--delete-generations' now deletes old Home generations."
Date: Sat, 23 Jul 2022 11:09:48 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 24c0518dd404cbb3c434fb6704f4f551bbc78693
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 17 02:00:00 2022 +0200

    Revert "guix gc: '--delete-generations' now deletes old Home generations."
    
    This reverts commit ba22560627f848f40891a56355ff26b6de1380bc.
---
 doc/guix.texi       | 3 +--
 guix/scripts/gc.scm | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 6e867839a4..12ecc1b952 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4362,8 +4362,7 @@ nothing and exit immediately.
 @item --delete-generations[=@var{duration}]
 @itemx -d [@var{duration}]
 Before starting the garbage collection process, delete all the generations
-older than @var{duration}, for all the user profiles and home environment
-generations; when run as root, this
+older than @var{duration}, for all the user profiles; when run as root, this
 applies to all the profiles @emph{of all the users}.
 
 For example, this command deletes all the generations of all your profiles
diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm
index 65cd4bdf8b..043273f491 100644
--- a/guix/scripts/gc.scm
+++ b/guix/scripts/gc.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2013, 2015-2020, 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,7 +26,6 @@
                                 profile-generations
                                 generation-number)
   #:autoload   (guix scripts package) (delete-generations)
-  #:autoload   (gnu home) (home-generation-base)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
   #:use-module (srfi srfi-1)
@@ -261,8 +260,7 @@ is deprecated; use '-D'~%"))
                      (filter-map (lambda (root)
                                    (and (or (zero? (getuid))
                                             (user-owned? root))
-                                        (or (generation-profile root)
-                                            (home-generation-base root))))
+                                        (generation-profile root)))
                                  (gc-roots)))))
       (for-each (lambda (profile)
                   (delete-old-generations store profile pattern))



reply via email to

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