Module Name:    src
Committed By:   christos
Date:           Fri May 14 22:06:34 UTC 2021

Modified Files:
        src: build.sh

Log Message:
ignore cvslatest errors in expert mode


To generate a diff of this commit:
cvs rdiff -u -r1.347 -r1.348 src/build.sh

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

Modified files:

Index: src/build.sh
diff -u src/build.sh:1.347 src/build.sh:1.348
--- src/build.sh:1.347	Sun Apr 25 18:29:22 2021
+++ src/build.sh	Fri May 14 18:06:34 2021
@@ -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

Reply via email to