[src/trunk]: src/usr.sbin/postinstall Remove the ability to specify multiple ...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dd7101fbb92c
branches:  trunk
changeset: 781020:dd7101fbb92c
user:      apb <apb%NetBSD.org@localhost>
date:      Wed Aug 15 16:21:41 2012 +0000

description:
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.

diffstat:

 usr.sbin/postinstall/postinstall   |  15 +--------------
 usr.sbin/postinstall/postinstall.8 |  13 +++++++++++--
 2 files changed, 12 insertions(+), 16 deletions(-)

diffs (62 lines):

diff -r a4c92c0746a7 -r dd7101fbb92c usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Wed Aug 15 15:39:23 2012 +0000
+++ b/usr.sbin/postinstall/postinstall  Wed Aug 15 16:21:41 2012 +0000
@@ -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 @@
                                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
diff -r a4c92c0746a7 -r dd7101fbb92c usr.sbin/postinstall/postinstall.8
--- a/usr.sbin/postinstall/postinstall.8        Wed Aug 15 15:39:23 2012 +0000
+++ b/usr.sbin/postinstall/postinstall.8        Wed Aug 15 16:21:41 2012 +0000
@@ -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 @@
 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.