From: Bruno Haible <bruno@clisp.org>
Date: Fri, 3 May 2002 16:18:24 +0000 (+0000)
Subject: Make more robust.
X-Git-Tag: v0.11.3~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce74bbdcf1dfded9c85ae728165db40d80d5e435;p=thirdparty%2Fgettext.git

Make more robust.
---

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 35920b01e..db7e38cae 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-03  Bruno Haible  <bruno@clisp.org>
+
+	* autopoint.in: Unset all other environment variables which influence
+	cvs. Pass -d $CVSROOT explicitly.
+
 2002-05-01  Bruno Haible  <bruno@clisp.org>
 
 	* autopoint-files: New directory.
diff --git a/misc/autopoint.in b/misc/autopoint.in
index cede398cd..57735358e 100644
--- a/misc/autopoint.in
+++ b/misc/autopoint.in
@@ -228,8 +228,21 @@ mkdir "$cvs_dir"
 mkdir "$work_dir"
 CVSROOT="$srcdir/$cvs_dir"
 export CVSROOT
+unset CVS_CLIENT_LOG
+unset CVS_CLIENT_PORT
+unset CVS_PASSFILE
+unset CVS_PASSWORD
+unset CVS_RCMD_PORT
+unset CVS_RSH
+unset CVS_SERVER
+unset CVS_SERVER_SLEEP
+unset CVSREAD
+unset CVSUMASK
+unset CVSWRAPPERS
 
-cvs init
+# Need to pass -d "$CVSROOT", because there may be a CVS directory in the
+# current directory.
+cvs -d "$CVSROOT" init
 gzip -d -c < "$gettext_dir/archive.tar.gz" | (cd "$cvs_dir" && tar xf -)
 
 cd "$work_dir"