From 5949b4419fd64d0ab199d1320b79102f6244927d Mon Sep 17 00:00:00 2001 From: dougb Date: Mon, 28 May 2001 09:35:30 +0000 Subject: Fix a problem when user selects -a (auto run) but we encounter a file missing on the system. Instead of passing it by, mm was prompting... bad mm, no cookie! Brought to my attention by the PR, but the fix needed to be tweaked to handle the auto-install option as well. PR: misc/25731 Gilbert Gong --- usr.sbin/mergemaster/mergemaster.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'usr.sbin') diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 727bd5c..f8d1a48 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -684,7 +684,22 @@ for COMPFILE in `find . -type f -size +0`; do # diff_loop function knows how to handle it. # if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then - diff_loop + case "${AUTO_RUN}" in + '') + diff_loop + ;; + *) + case "${AUTO_INSTALL}" in + '') + # If this is an auto run, make it official + echo " *** ${COMPFILE} will remain for your consideration" + ;; + *) + diff_loop + ;; + esac + ;; + esac # Auto run test continue fi -- cgit v1.1