diff options
| author | dougb <dougb@FreeBSD.org> | 2001-05-28 09:35:30 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2001-05-28 09:35:30 +0000 |
| commit | 5949b4419fd64d0ab199d1320b79102f6244927d (patch) | |
| tree | dfcff37a7d108b68d5d3a074f81e2f215a3c0a7e /usr.sbin | |
| parent | 9b619de16b1a2e86ed560da033cfb48028aa1439 (diff) | |
| download | FreeBSD-src-5949b4419fd64d0ab199d1320b79102f6244927d.zip FreeBSD-src-5949b4419fd64d0ab199d1320b79102f6244927d.tar.gz | |
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 <ggong@cal.alumni.berkeley.edu>
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 17 |
1 files changed, 16 insertions, 1 deletions
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 |
