[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
- branch master updated (b2f8186 -> 9bbbac6), guix-commits, 2021/11/16
- 07/08: gnu: Add texlive-translator., guix-commits, 2021/11/16
- 01/08: services: openssh: Collect all keys for all users., guix-commits, 2021/11/16
- 03/08: daemon: Do not deduplicate files smaller than 8 KiB., guix-commits, 2021/11/16
- 05/08: home: services: bash: Emit 'extra-content' first again.,
guix-commits <=
- 08/08: gnu: Add texlive-latex-textpos., guix-commits, 2021/11/16
- 02/08: tests: Factorize 'file=?'., guix-commits, 2021/11/16
- 04/08: home: services: Fix typo., guix-commits, 2021/11/16
- 06/08: home: Adjust 'guix home import' test for shell aliases., guix-commits, 2021/11/16