summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2003-11-28 22:46:48 +0000
committerhubertf <hubertf@pkgsrc.org>2003-11-28 22:46:48 +0000
commitdc7684ff060c14ef08a1e993d9625ce829651e9d (patch)
tree61b94b6c5afe6f522558d030e46adf3231c372a2 /mk
parent772a22cfed5c50e22ee9ec2e062a3788ec644156 (diff)
downloadpkgsrc-dc7684ff060c14ef08a1e993d9625ce829651e9d.tar.gz
Catch if the user given to "su" is bogus/non-existing, but if
the "cvs" command inside the su returns an error, that should be ignored. (Aparently cvs returns "1" even if it's done a successful update but if there were some files removed on purpose).
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/pre-build4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 7fc53c22e42..019ea2b0b6a 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.31 2003/11/20 00:02:59 hubertf Exp $
+# $NetBSD: pre-build,v 1.32 2003/11/28 22:46:48 hubertf Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -148,7 +148,7 @@ if [ "$CVS_USER" != "" ]; then
( cd ${USR_PKGSRC}/security/ssh ; ${BMAKE} bulk-install )
fi
echo Performing CVS update - this will take some time
- su - ${CVS_USER} -c 'stty sane ; setenv CVS_RSH ssh ; cd '${USR_PKGSRC}' ; cvs -q update -Pd '"${CVS_FLAGS}"
+ su - ${CVS_USER} -c "stty sane ; setenv CVS_RSH ssh ; cd ${USR_PKGSRC} ; cvs -q update -Pd ${CVS_FLAGS} || exit 0"
if [ $? != 0 ]
then
echo CVS update not successful, aborting.