diff options
| author | dougb <dougb@FreeBSD.org> | 2004-03-07 10:10:19 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2004-03-07 10:10:19 +0000 |
| commit | e0dc37e40d30fa5d4ae2fe5d99fc60c4c7f034ae (patch) | |
| tree | 73dd0ecea90363ba38d806fd142c1f01e65171be /usr.sbin | |
| parent | 3f80ac14a29a0b502c7a70595700696412932151 (diff) | |
| download | FreeBSD-src-e0dc37e40d30fa5d4ae2fe5d99fc60c4c7f034ae.zip FreeBSD-src-e0dc37e40d30fa5d4ae2fe5d99fc60c4c7f034ae.tar.gz | |
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
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index b980266..6ec345a 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' ;; *) |
