movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib.filesystem.pathType: Improve error for non-existent paths

Browse source 
Previously it would fail with

  error: attribute 'nonexistent' missing

         at nixpkgs/lib/filesystem.nix:29:10:

             28|     if dirOf path == path then "directory"
             29|     else (readDir (dirOf path)).${baseNameOf path};
               |          ^
             30|
This commit is contained in:
Silvan Mosberger 2023-04-05 16:58:29 +02:00
parent bb6eab0bdb
commit d064d972f0
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/filesystem.nix
View file

@ -22,10 +22,14 @@ in
Returns the type of a path: regular (for file), symlink, or directory. Returns the type of a path: regular (for file), symlink, or directory.
*/ */
pathType = path: pathType = path:
if ! pathExists path
# Fail irrecoverably to mimic the historic behavior of this function and
# the new builtins.readFileType
then abort "lib.filesystem.pathType: Path ${toString path} does not exist."
# The filesystem root is the only path where `dirOf / == /` and # The filesystem root is the only path where `dirOf / == /` and
# `baseNameOf /` is not valid. We can detect this and directly return # `baseNameOf /` is not valid. We can detect this and directly return
# "directory", since we know the filesystem root can't be anything else. # "directory", since we know the filesystem root can't be anything else.
if dirOf path == path else if dirOf path == path
then "directory" then "directory"
else (readDir (dirOf path)).${baseNameOf path}; else (readDir (dirOf path)).${baseNameOf path};

1
lib/tests/filesystem.sh
View file

@ -51,6 +51,7 @@ checkPathType "$PWD/directory" '"directory"'
checkPathType "$PWD/regular" '"regular"' checkPathType "$PWD/regular" '"regular"'
checkPathType "$PWD/symlink" '"symlink"' checkPathType "$PWD/symlink" '"symlink"'
checkPathType "$PWD/fifo" '"unknown"' checkPathType "$PWD/fifo" '"unknown"'
checkPathType "$PWD/non-existent" "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'"
checkPathIsDirectory() { checkPathIsDirectory() {
local path=$1 local path=$1