From 78a6854e219ba266b6cc12f840b571c5f1168b5e Mon Sep 17 00:00:00 2001 From: Sam Bobroff Date: Mon, 20 Jul 2015 15:12:19 +1000 Subject: merge_config.sh: exit on missing input files Add a check for the existence of input files and exit (with failure) if they are missing. Without this additional check, missing files produce error messages but still result in an output file being generated and a successful exit code. Signed-off-by: Sam Bobroff Signed-off-by: Michal Marek --- scripts/kconfig/merge_config.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/kconfig') diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index ec8e20350a64..0d883b37882a 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -100,6 +100,10 @@ cat $INITFILE > $TMP_FILE # Merge files, printing warnings on overridden values for MERGE_FILE in $MERGE_LIST ; do echo "Merging $MERGE_FILE" + if [ ! -r "$MERGE_FILE" ]; then + echo "The merge file '$MERGE_FILE' does not exist. Exit." >&2 + exit 1 + fi CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE) for CFG in $CFG_LIST ; do -- cgit v1.2.3