From 4c1e476ea1c4fb4b8593e895c1fe94bdfe6ea17c Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sun, 7 Mar 2004 10:10:19 +0000 Subject: [PATCH] In the case where /etc/rc.d/ is empty, do not bogusly ask the user if they want to delete '*'. It turns out that there is one valid case where this might happen, installing to an empty DESTDIR. Patch submitted by: schweikh --- usr.sbin/mergemaster/mergemaster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index b980266a941..6ec345a5a78 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -794,7 +794,7 @@ if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then fi done case "${STALE_RC_FILES}" in - '') + ''|' *') echo ' *** No stale files found' ;; *)