CVS commit: src/share/zoneinfo

["Alan Barrett" <apb%netbsd.org@localhost>]

Module Name:    src
Committed By:   apb
Date:           Fri Jun 13 19:56:19 UTC 2014

Modified Files:
        src/share/zoneinfo: tzdata2netbsd

Log Message:
Update tzdata2netbsd for 2014e release.
* Rename work directory so there's a subdir per release.
* Slightly better detection of work that's already been done.
? update-work
cvs diff: Diffing .
Index: tzdata2netbsd
===================================================================
RCS file: /cvsroot/src/share/zoneinfo/tzdata2netbsd,v
retrieving revision 1.2
diff -d -p -u -r1.2 tzdata2netbsd
--- tzdata2netbsd       18 May 2014 16:53:56 -0000      1.2
+++ tzdata2netbsd       13 Jun 2014 19:54:55 -0000
@@ -1,10 +1,19 @@
 # $NetBSD: tzdata2netbsd,v 1.2 2014/05/18 16:53:56 apb Exp $
-#
+
 # For use by NetBSD developers when updating to new versions of tzdata.
 #
+# 0. Be in an up-to-date checkout of src/share/zoneinfo from NetBSD-current.
+# 1. Edit OLDVER and NEWVER below.
+# 3. Run this script.  You will be prompted for confirmation before
+#    anything major (such as a cvs operation).
+# 4. If something fails, abort the script and fix it.
+# 5. Re-run this script until you are happy.  It's designed to
+#    be re-run over and over, and later runs will try not to
+#    redo non-trivial work done by earlier runs.
+#

-OLDVER=2013i
-NEWVER=2014c
+OLDVER=2014c
+NEWVER=2014e

 # Uppercase variants of OLDVER and NEWVER
 OLDVER_UC="$( echo "${OLDVER}" | tr '[a-z]' '[A-Z]' )"
@@ -23,8 +32,8 @@ NEWSURL="https://github.com/eggert/tz/ra

 # Directories
 REPODIR="src/share/zoneinfo"   # relative to the NetSBD CVS repository
-WORKDIR="$(pwd)/update-work"
-EXTRACTDIR="${WORKDIR}/extract/${NEWVER}"
+WORKDIR="$(pwd)/update-work/${NEWVER}"
+EXTRACTDIR="${WORKDIR}/extract"

 # Files in the work directory
 DISTFILE="${WORKDIR}/${DISTURL##*/}"
@@ -54,7 +63,7 @@ DOIT()
                echo "REALLY DOING IT NOW..."
                "$@"
        else
-               echo "NOT REALLY DOING:" "$@"
+               echo "NOT REALLY DOING THE ABOVE COMMAND"
        fi
 }

@@ -134,6 +143,7 @@ EOF

 extract()
 {
+       [ -f "${EXTRACTDIR}/zone.tab" ] && return
        mkdir -p "${EXTRACTDIR}"
        tar -z -xf "${DISTFILE}" -C "${EXTRACTDIR}"
 }
@@ -143,6 +153,7 @@ extract()
 #
 trimnews()
 {
+       [ -s "${NEWSTRIMFILE}" ] && return
        awk -v oldver="${OLDVER}" -v newver="${NEWVER}" \
            '
                BEGIN {inrange = 0}
cvs diff: Diffing datfiles


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/zoneinfo/tzdata2netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.