Synchronise with v4.3

[kconfig-frontends] / utils / merge

diff --git a/utils/merge b/utils/merge
index ec8e20350a648ca0f47f152f9650f6fa6e421a0b..0d883b37882a145b588a45f53f3be373849e7410 100755 (executable)
--- a/utils/merge
+++ b/utils/merge
@@ -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