guix-commits
[Top][All Lists]
Advanced

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

branch master updated: scripts: home: Move ensure-profile-directory to a


From: guix-commits
Subject: branch master updated: scripts: home: Move ensure-profile-directory to a better place.
Date: Fri, 24 Feb 2023 07:57:04 -0500

This is an automated email from the git hooks/post-receive script.

abcdw pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new e615aaca28 scripts: home: Move ensure-profile-directory to a better 
place.
e615aaca28 is described below

commit e615aaca28fd6b797e9b41a71096ebe878c89299
Author: Andrew Tropin <andrew@trop.in>
AuthorDate: Fri Feb 24 16:04:33 2023 +0400

    scripts: home: Move ensure-profile-directory to a better place.
    
    The profile directory is usually created by daemon, when user opens a
    connection.  Ideally, we would like to remove ensure-profile-directory call 
at
    all, but daemon doesn't handle case with custom $GUIX_STATE_DIRECTORY yet.
    More information in: <https://issues.guix.gnu.org/61717>
    
    * guix/scripts/home.scm (process-action): Move ensure-profile-directory call
    to the place, where connection to the daemon is already open.
    
    Reported-by: wolf <wolf@wolfsden.cz>
---
 guix/scripts/home.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm
index 1d8aae727e..d86094bc43 100644
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
+;;; Copyright © 2021, 2023 Andrew Tropin <andrew@trop.in>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>
@@ -409,6 +409,7 @@ immediately.  Return the exit status of the process in the 
container."
                          network?)
   "Perform ACTION for home environment. "
 
+  (ensure-profile-directory)
   (define println
     (cut format #t "~a~%" <>))
 
@@ -473,7 +474,6 @@ ACTION must be one of the sub-commands that takes a home 
environment
 declaration as an argument (a file name.)  OPTS is the raw alist of options
 resulting from command-line parsing."
   (define (ensure-home-environment file-or-exp obj)
-    (ensure-profile-directory)
     (unless (home-environment? obj)
       (leave (G_ "'~a' does not return a home environment~%")
              file-or-exp))



reply via email to

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