diff options
| author | Bryan Drewery <bryan@shatow.net> | 2022-11-10 07:46:41 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2022-11-10 07:46:41 +0300 |
| commit | ba7abcbe7d78994f9631e4e9ee39ff6188aa5dc4 (patch) | |
| tree | f3cfa611cd07e3c55c6494e48f6838980fa12995 | |
| parent | ed634c7f699848818699cacc72ed828fc0d4d2d2 (diff) | |
read_file: Restore not showing a warning on missing file.
This was broken in b6a430f0
| -rw-r--r-- | src/share/poudriere/include/util.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/share/poudriere/include/util.sh b/src/share/poudriere/include/util.sh index 97c62ee5..563be592 100644 --- a/src/share/poudriere/include/util.sh +++ b/src/share/poudriere/include/util.sh @@ -437,12 +437,6 @@ read_file() { # var_return may be empty if only $_read_file_lines_read is being # used. _ret=0 - - if mapfile_builtin; then - _mapfile_read_file "$@" || _ret="$?" - return "${_ret}" - fi - _read_file_lines_read=0 case "${file}" in -|/dev/stdin) file="/dev/fd/0" ;; @@ -456,6 +450,11 @@ read_file() { ;; esac + if mapfile_builtin; then + _mapfile_read_file "$@" || _ret="$?" + return "${_ret}" + fi + set +e _data= newline=$'\n' |