[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: environment: Deal with single-entry search paths.
From: |
Ludovic Courtès |
Subject: |
06/06: environment: Deal with single-entry search paths. |
Date: |
Wed, 5 Apr 2017 16:56:40 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 50f4ea18c46ea6e702dbd20841401662ba925f76
Author: Ludovic Courtès <address@hidden>
Date: Wed Apr 5 22:50:21 2017 +0200
environment: Deal with single-entry search paths.
This is a followup to fcd75bdbfa99d14363b905afbf914eec20e69df8.
* guix/scripts/environment.scm (create-environment): Check whether
SEPARATOR is #f.
---
guix/scripts/environment.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 44f4900..5a6abd0 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -79,7 +79,9 @@ existing enviroment variables with additional search paths."
(let ((current (getenv variable)))
(setenv variable
(if (and current (not pure?))
- (string-append value separator current)
+ (if separator
+ (string-append value separator current)
+ value)
value)))))
(evaluate-profile-search-paths profile paths))
- branch master updated (b28187c -> 50f4ea1), Ludovic Courtès, 2017/04/05
- 01/06: Revert "gnu: openexr: Add IlmBase include sub-directory to 'OpenEXR.pc'.", Ludovic Courtès, 2017/04/05
- 06/06: environment: Deal with single-entry search paths.,
Ludovic Courtès <=
- 03/06: build-system/python: 'package-with-explicit-python' uses 'package-mapping'., Ludovic Courtès, 2017/04/05
- 05/06: doc: Add "Documentation" section., Ludovic Courtès, 2017/04/05
- 04/06: profiles: Generate database file for man pages., Ludovic Courtès, 2017/04/05
- 02/06: packages: Add 'package-mapping' and base 'package-input-rewriting' on it., Ludovic Courtès, 2017/04/05