[src/trunk]: src/external/public-domain/tz Actually create the "done" files, ...

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

details:   https://anonhg.NetBSD.org/src/rev/1758bac39169
branches:  trunk
changeset: 806963:1758bac39169
user:      apb <apb%NetBSD.org@localhost>
date:      Sat Mar 21 16:42:17 2015 +0000

description:
Actually create the "done" files, and test them for existence.

diffstat:

 external/public-domain/tz/tzdata2netbsd |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 662db16310bf -r 1758bac39169 external/public-domain/tz/tzdata2netbsd
--- a/external/public-domain/tz/tzdata2netbsd   Sat Mar 21 15:56:54 2015 +0000
+++ b/external/public-domain/tz/tzdata2netbsd   Sat Mar 21 16:42:17 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.5 2015/03/21 15:51:20 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.6 2015/03/21 16:42:17 apb Exp $
 
 # For use by NetBSD developers when updating to new versions of tzdata.
 #
@@ -271,7 +271,7 @@
 
 cvsimport()
 {
-       if [ -s "${IMPORTDONEFILE}" ]; then
+       if [ -e "${IMPORTDONEFILE}" ]; then
                cat >&2 <<EOF
 The CVS import has already been performed.
 EOF
@@ -290,20 +290,21 @@
        ( cd "${EXTRACTDIR}" &&
          DOIT cvs -d "${CVSROOT}" import -m "$(cat "${IMPORTMSGFILE}")" \
                "${REPODIR}" "${CVSBRANCHTAG}" "${CVSNEWTAG}"
-       )
+       ) && touch "${IMPORTDONEFILE}"
 }
 
 cvsmerge()
 {
 
        cd "${TZDISTDIR}" || exit 1
-       if [ -s "${MERGEDONEFILE}" ]; then
+       if [ -e "${MERGEDONEFILE}" ]; then
                cat >&2 <<EOF
 The CVS merge has already been performed.
 EOF
                return 0
        fi
-       DOIT cvs -d "${CVSROOT}" update -j"${CVSOLDTAG}" -j"${CVSNEWTAG}"
+       DOIT cvs -d "${CVSROOT}" update -j"${CVSOLDTAG}" -j"${CVSNEWTAG}" \
+       && touch "${MERGEDONEFILE}"
 }
 
 resolveconflicts()
@@ -330,13 +331,14 @@
 EOF
                return 1
        fi
-       if [ -s "${COMMITMERGEDONEFILE}" ]; then
+       if [ -e "${COMMITMERGEDONEFILE}" ]; then
                cat >&2 <<EOF
 The CVS commmit (of the merge result) has already been performed.
 EOF
                return 0
        fi
-       DOIT cvs -d "${CVSROOT}" commit -m "Merge tzdata${NEWVER}"
+       DOIT cvs -d "${CVSROOT}" commit -m "Merge tzdata${NEWVER}" \
+       && touch "${COMMITMERGEDONEFILE}"
 }
 
 extra()