gcc_release (build_sources): Do not use "-r" and "-D" at the same time with "cvs...

	* gcc_release (build_sources): Do not use "-r" and "-D" at the
	same time with "cvs export".

From-SVN: r80480

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 13bd6edf4165276f5ba004108ba55259931abfc8..7b4f157029c322e2eff5d750a739c46a2a44ec49 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-07  Mark Mitchell  <mark@codesourcery.com>
+
+       * gcc_release (build_sources): Do not use "-r" and "-D" at the
+       same time with "cvs export".
+
 2004-03-27  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * gcc_release: Fix sanity check for argument of -p command-line

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index c21c1b94de1312c750f9e32352581b09d9c1a38e..3ac73da469f64190a38eed8ea9495f98a065a42a 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -157,20 +157,22 @@ EOF
   fi
 
   # Tag the sources.
+  EXPORTDATE=""
   if [ -n "${TAG}" ]; then
     inform "Tagging sources as ${TAG}"
     ${CVS} rtag -r ${CVSBRANCH} -F ${TAG} gcc || \
       error "Could not tag sources"
     EXPORTTAG="-r${TAG}"
-    EXPORTDATE=""
   else
     if [ ${CVSBRANCH} != "HEAD" ]; then
       EXPORTTAG="-r${CVSBRANCH}"
+      # It does not work to use both "-r" and "-D" with
+      # "cvs export" so EXPORTDATE is not set here.
     else
       # HEAD is the default branch, no need to specify it.
       EXPORTTAG=""
+      EXPORTDATE="-D`date -u +"%Y-%m-%d %H:%M"` UTC"
     fi
-    EXPORTDATE="-D`date -u +"%Y-%m-%d %H:%M"` UTC"
   fi
 
   # Export the current sources.