Module Name: src
Committed By: apb
Date: Wed Aug 15 16:26:41 UTC 2012
Modified Files:
src/usr.sbin/etcupdate: etcupdate etcupdate.8
Log Message:
Remove the ability to specify multiple colon-separated file 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.50 -r1.51 src/usr.sbin/etcupdate/etcupdate
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/etcupdate/etcupdate.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/etcupdate/etcupdate
diff -u src/usr.sbin/etcupdate/etcupdate:1.50 src/usr.sbin/etcupdate/etcupdate:1.51
--- src/usr.sbin/etcupdate/etcupdate:1.50 Thu Jun 24 17:12:06 2010
+++ src/usr.sbin/etcupdate/etcupdate Wed Aug 15 16:26:41 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: etcupdate,v 1.50 2010/06/24 17:12:06 joerg Exp $
+# $NetBSD: etcupdate,v 1.51 2012/08/15 16:26:41 apb Exp $
#
# Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -455,19 +455,6 @@ do
BINARYMODE=true
BINARYDIRMODE=true
BINARYDIR="${arg}"
- elif [ -f "${arg%%:*}" -a -f "${arg##*:}" -a ! -f "${arg}" ]
- then
- # Backward compatibility: allow arg to refer
- # to a colon-separated list of tgz files.
- # Remove this after NetBSD-5.0 is released.
- cat <<EOF
-*** WARNING: The "-s tgzfile1:tgzfile2" option is deprecated. Please use
- "-s tgzfile1 -s tgzfile2" in future.
-EOF
- BINARYMODE=true
- BINARYTGZMODE=true
- TGZLIST="${TGZLIST}${TGZLIST:+ }$( \
- IFS=: eval shell_quote \${arg} )"
else
echo "*** Nonexistent file or directory for -s ${arg}"
usage
Index: src/usr.sbin/etcupdate/etcupdate.8
diff -u src/usr.sbin/etcupdate/etcupdate.8:1.19 src/usr.sbin/etcupdate/etcupdate.8:1.20
--- src/usr.sbin/etcupdate/etcupdate.8:1.19 Tue Dec 8 09:46:35 2009
+++ src/usr.sbin/etcupdate/etcupdate.8 Wed Aug 15 16:26:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: etcupdate.8,v 1.19 2009/12/08 09:46:35 mbalmer Exp $
+.\" $NetBSD: etcupdate.8,v 1.20 2012/08/15 16:26:41 apb Exp $
.\"
.\" Copyright (c) 2001-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 ETCUPDATE 8
.Os
.Sh NAME
@@ -382,6 +382,15 @@ option was deprecated,
and options deprecated in
.Nx 4.0
were removed.
+.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.
.Sh AUTHORS
The script was written by
.An Martti Kuparinen
