guix-commits
[Top][All Lists]
Advanced

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

05/08: home: services: bash: Emit 'extra-content' first again.


From: guix-commits
Subject: 05/08: home: services: bash: Emit 'extra-content' first again.
Date: Tue, 16 Nov 2021 08:38:54 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit c322d97832081e6e1913c6311616030d1fad4ee2
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Nov 16 13:23:08 2021 +0100

    home: services: bash: Emit 'extra-content' first again.
    
    Fixes a regression introduced in
    4b96998292442ec03024481c911d88f86c7c36b5 that would less to a
    'tests/guix-home.sh' failure.
    
    * gnu/home/services/shells.scm (add-bash-configuration)[file-if-not-empty]:
    Move EXTRA-CONTENT first.
---
 gnu/home/services/shells.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index 6b9ebe4..80f13a3 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -420,9 +420,9 @@ alias grep='grep --color=auto'\n")
               (not (null? ((configuration-field-getter field-obj) config))))
           `(,(object->snake-case-string file-name)
             ,(apply mixed-text-file
-              (object->snake-case-string file-name)
-              (cons (serialize-field field)
-                    (if extra-content extra-content '()))))
+                    (object->snake-case-string file-name)
+                    (append (or extra-content '())
+                        (list (serialize-field field)))))
           '())))
 
   (filter



reply via email to

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