JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

readPathsFromFile: fixup after #23851

Browse Source 
The final newline would produce an empty string;
let's filter all empty lines as well.
This commit is contained in:
Vladimír Čunát 2017-03-19 10:16:44 +01:00
parent 48deda9f36
commit 36de745e1b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/strings.nix
View File

@ -479,7 +479,7 @@ rec {
lines = lines =
builtins.map (lib.removeSuffix "\n") builtins.map (lib.removeSuffix "\n")
(lib.splitString "\n" (builtins.readFile file)); (lib.splitString "\n" (builtins.readFile file));
removeComments = lib.filter (line: !(lib.hasPrefix "#" line)); removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
relativePaths = removeComments lines; relativePaths = removeComments lines;
absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths; absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths;
in in