Module Name: src
Committed By: apb
Date: Wed Aug 15 16:21:41 UTC 2012
Modified Files:
src/usr.sbin/postinstall: postinstall postinstall.8
Log Message:
Remove the ability to specify multiple colon-separated fiel names with
a single "-s" option. Multiple "-s" options must now be used instead.
We have been printing a warning about this since 2008-09-14.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/usr.sbin/postinstall/postinstall
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/postinstall/postinstall.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.145 src/usr.sbin/postinstall/postinstall:1.146
--- src/usr.sbin/postinstall/postinstall:1.145 Wed Aug 15 12:48:19 2012
+++ src/usr.sbin/postinstall/postinstall Wed Aug 15 16:21:41 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.145 2012/08/15 12:48:19 apb Exp $
+# $NetBSD: postinstall,v 1.146 2012/08/15 16:21:41 apb Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1908,19 +1908,6 @@ main()
if [ -f "${OPTARG}/etc/Makefile" ]; then
SOURCEMODE=true
fi
- elif [ -f "${OPTARG%%:*}" -a -f "${OPTARG##*:}" \
- -a ! -f "${OPTARG}" ]
- then
- # Backward compatibility: allow arg to refer
- # to a colon-separated list of tgz files.
- # Remove this after NetBSD-5.0 is released.
- cat >&2 <<EOF
-*** WARNING: The "-s tgzfile1:tgzfile2" option is deprecated. Please use
- "-s tgzfile1 -s tgzfile2" in future.
-EOF
- TGZMODE=true
- TGZLIST="${TGZLIST}${TGZLIST:+ }$( \
- IFS=: eval shell_quote \${OPTARG} )"
else
err 2 "Invalid argument for -s option"
fi
Index: src/usr.sbin/postinstall/postinstall.8
diff -u src/usr.sbin/postinstall/postinstall.8:1.15 src/usr.sbin/postinstall/postinstall.8:1.16
--- src/usr.sbin/postinstall/postinstall.8:1.15 Sun Nov 22 18:45:27 2009
+++ src/usr.sbin/postinstall/postinstall.8 Wed Aug 15 16:21:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: postinstall.8,v 1.15 2009/11/22 18:45:27 mbalmer Exp $
+.\" $NetBSD: postinstall.8,v 1.16 2012/08/15 16:21:41 apb Exp $
.\"
.\" Copyright (c) 2005-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 4, 2008
+.Dd August 15, 2012
.Dt POSTINSTALL 8
.Os
.Sh NAME
@@ -181,3 +181,12 @@ In
the ability to specify multiple colon-separated files with a single
.Fl s
option was deprecated.
+.Pp
+In
+.Nx 7.0 ,
+the ability to specify multiple colon-separated files with a single
+.Fl s
+option was removed.
+Multiple
+.Fl s
+options must be used instead.
