diff options
| author | eadler <eadler@FreeBSD.org> | 2018-03-15 10:13:25 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2018-03-15 10:13:25 +0000 |
| commit | e00848cc744530e7bfe38b10ecab34ab6b8f7747 (patch) | |
| tree | 761f9aad156803c6d4d615e549b3c0ba8f364626 /usr.sbin | |
| parent | d8ad58f81f474320dd17b4cbb4a93744964d58b6 (diff) | |
| download | FreeBSD-src-e00848cc744530e7bfe38b10ecab34ab6b8f7747.zip FreeBSD-src-e00848cc744530e7bfe38b10ecab34ab6b8f7747.tar.gz | |
MFC r324441:
Fix freebsd-update(8) erroneous message and exit status when "fetch install" used.
PR: 190660
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index e24bcb2..b4e50ad 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -420,6 +420,9 @@ init_params () { # Run without a TTY NOTTYOK=0 + + # Fetched first in a chain of commands + ISFETCHED=0 } # Parse the command line @@ -785,8 +788,10 @@ install_check_params () { # Check that we have updates ready to install if ! [ -L ${BDHASH}-install ]; then echo "No updates are available to install." - echo "Run '$0 fetch' first." - exit 1 + if [ $ISFETCHED -eq 0 ]; then + echo "Run '$0 fetch' first." + fi + exit 0 fi if ! [ -f ${BDHASH}-install/INDEX-OLD ] || ! [ -f ${BDHASH}-install/INDEX-NEW ]; then @@ -3243,6 +3248,7 @@ cmd_fetch () { fi fetch_check_params fetch_run || exit 1 + ISFETCHED=1 } # Cron command. Make sure the parameters are sensible; wait |
