diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-15 07:42:57 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-15 07:43:00 +0100 |
commit | d41baf11ffc0e3a8a319a1012586c271d3c75da2 (patch) | |
tree | 9f1f36c2f27d244942919cb968a452fd3076b2a5 | |
parent | f078fe59f8774c6229ad39d4df257c52216c3f54 (diff) | |
download | ptxdist-d41baf11ffc0e3a8a319a1012586c271d3c75da2.tar.gz ptxdist-d41baf11ffc0e3a8a319a1012586c271d3c75da2.tar.xz |
ptxdist: ignore /dev/null symlinks when looking for config files
This can happen if the top layer would have an empty diff and on the next
lower layer the config is a /dev/null symlink.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-x | bin/ptxdist | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 2e6ec93a8..f6efe88ae 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -1374,7 +1374,7 @@ setup_layers() PTXDIST_PTXCONFIG="${PTXDIST_LAYERS[0]}/${cfgs[0]}" for layer in "${PTXDIST_LAYERS[@]}"; do local -a ptxd_reply - ptxd_get_path "${cfgs[@]/#/${layer}/}" || continue + ptxd_get_path_filtered "${cfgs[@]/#/${layer}/}" || continue PTXDIST_PTXCONFIG="${ptxd_reply[0]}" break done @@ -1389,7 +1389,7 @@ setup_layers() tmp=( "${tmp[0]}" ) fi local -a ptxd_reply - ptxd_get_path "${tmp[@]}" || continue + ptxd_get_path_filtered "${tmp[@]}" || continue PTXDIST_PLATFORMCONFIG="${ptxd_reply[0]}" break done @@ -1398,7 +1398,7 @@ setup_layers() if [ "${PTX_collectionconfig_SET}" = "false" ]; then for layer in "${PTXDIST_LAYERS[@]}"; do local -a ptxd_reply - ptxd_get_path "${layer}/selected_collectionconfig" || continue + ptxd_get_path_filtered "${layer}/selected_collectionconfig" || continue PTXDIST_COLLECTIONCONFIG="${ptxd_reply[0]}" break done @@ -1407,7 +1407,7 @@ setup_layers() if [ "${PTX_toolchain_SET}" = "false" ]; then for layer in "${PTXDIST_LAYERS[@]}"; do local -a ptxd_reply - ptxd_get_path "${layer}/selected_toolchain" || continue + ptxd_get_path_filtered "${layer}/selected_toolchain" || continue PTXDIST_TOOLCHAIN="${ptxd_reply[0]}" break done |