diff options
| author |   sthen <sthen@openbsd.org> | 2010-08-21 09:32:00 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2010-08-21 09:32:00 +0000 |
| commit | 93b8ce61914c4f07d3ae590e67b1f8531d810741 (patch) | |
| tree | 26e50d5dc888b72c25383c6d44cc4340240d60b3 | |
| parent | an unchecked-for failure of workq_add_task could lead to an mbuf leak (diff) | |
| download | wireguard-openbsd-93b8ce61914c4f07d3ae590e67b1f8531d810741.tar.xz wireguard-openbsd-93b8ce61914c4f07d3ae590e67b1f8531d810741.zip | |
Display usage information as well as the error when a path to
src/*.tgz isn't specified. ok ajacoutot@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 54520a8133e..30ae7b14a8e 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.62 2010/07/20 05:35:29 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.63 2010/08/21 09:32:00 sthen Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009, 2010 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -697,6 +697,7 @@ if [ -z "${SRCDIR}" -a -z "${TGZ}" -a -z "${XTGZ}" ]; then SRCDIR=/usr/src else echo " *** Error: please specify a valid path to src or (x)etcXX.tgz" + usage error_rm_wrkdir fi fi |