Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src ignore cvslatest errors in expert mode



details:   https://anonhg.NetBSD.org/src/rev/dfc742cd9fda
branches:  trunk
changeset: 379151:dfc742cd9fda
user:      christos <christos%NetBSD.org@localhost>
date:      Fri May 14 22:06:34 2021 +0000

description:
ignore cvslatest errors in expert mode

diffstat:

 build.sh |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r f1c004f22c8f -r dfc742cd9fda build.sh
--- a/build.sh  Fri May 14 21:14:55 2021 +0000
+++ b/build.sh  Fri May 14 22:06:34 2021 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.347 2021/04/25 22:29:22 christos Exp $
+#      $NetBSD: build.sh,v 1.348 2021/05/14 22:06:34 christos Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1973,7 +1973,7 @@ createmakewrapper()
        eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.347 2021/04/25 22:29:22 christos Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.348 2021/05/14 22:06:34 christos Exp $
 # with these arguments: ${_args}
 #
 
@@ -2312,7 +2312,11 @@ setup_mkrepro()
        if [ ! -x "${cvslatest}" ]; then
                buildtools
        fi
-       MKREPRO_TIMESTAMP=$("${cvslatest}" ${dirs})
+       local cvslatestflags=
+       if ${do_expertmode}; then
+               cvslatestflags=-i
+       fi
+       MKREPRO_TIMESTAMP=$("${cvslatest}" ${cvslatestflags} ${dirs})
        [ -n "${MKREPRO_TIMESTAMP}" ] || bomb "Failed to compute timestamp"
        statusmsg2 "MKREPRO_TIMESTAMP" "$(TZ=UTC date -r ${MKREPRO_TIMESTAMP})"
        export MKREPRO MKREPRO_TIMESTAMP



Home | Main Index | Thread Index | Old Index