gcc_release: Execute gcc.gnu.org-only operations which are related to diff generation...

	* gcc_release: Execute gcc.gnu.org-only operations which are
	related to diff generation only if diffs have been requested.
	(build_sources): Improve tracing and an error message related
	to tagging.

From-SVN: r68924

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 30253f69ed3848248a06296c2922d9e5c9be4aec..79c0170cea1af7cbd90b9b4d8ac185cfe612d487 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-04  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+       * gcc_release: Execute gcc.gnu.org-only operations which are
+       related to diff generation only if diffs have been requested.
+       (build_sources): Improve tracing and an error message related
+       to tagging.
+
 2003-07-01  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
        * gcc_release (BRANCH): Rename to...

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 41fbfa98afb483f8ba523c026b833c4219a870fc..558cd79622547c0a2f29734f890d22c32459ec80 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -158,9 +158,9 @@ EOF
 
   # Tag the sources.
   if [ -n "${TAG}" ]; then
-    inform "Tagging release sources"
+    inform "Tagging sources as ${TAG}"
     ${CVS} rtag -r ${CVSBRANCH} -F ${TAG} gcc || \
-      error "Could not tag release sources"
+      error "Could not tag sources"
     CVSBRANCH=$TAG
   fi
 
@@ -571,7 +571,7 @@ else
 
   # Building locally on gcc.gnu.org, we know what the last snapshot date
   # was.
-  if [ $LOCAL -ne 0 ]; then
+  if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ]; then
     LAST_DATE=`cat ~/.snapshot_date-${BRANCH}`
     LAST_LONG_DATE=`date --date=$LAST_DATE +%Y-%m-%d`
     LAST_DIR=~ftp/pub/gcc/snapshots/${LAST_LONG_DATE}