From 1971aca7ae37665294ea381172de63ce1662cb91 Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 9 May 2002 05:49:55 +0000
Subject: [PATCH] * gcc_release: Correct upload handling.

From-SVN: r53315
---
 maintainer-scripts/ChangeLog   | 4 ++++
 maintainer-scripts/gcc_release | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index e4d37ce0032..732172a98fc 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-08  Mark Mitchell  <mark@codesourcery.com>
+
+	* gcc_release: Correct upload handling.
+
 2002-04-22  Mark Mitchell  <mark@codesourcery.com>
 
 	* gcc_release (build_diffs): Remove reference to Chill.
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 298ac825ea4..850525f4b93 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -337,9 +337,11 @@ upload_files() {
   # Make sure the directory exists on the server.
   if [ $LOCAL -eq 0 ]; then
     ${SSH} -l ${GCC_USERNAME} ${GCC_HOSTNAME} mkdir ${FTP_PATH}
+    UPLOAD_PATH="${GCC_USERNAME}@${GCC_HOSTNAME}:${FTP_PATH}"
   else
     mkdir -p "${FTP_PATH}" \
       || error "Could not create \`${FTP_PATH}'"
+    UPLOAD_PATH=${FTP_PATH}
   fi
 
   for x in gcc*.gz gcc*.bz2; do
@@ -347,8 +349,9 @@ upload_files() {
       # Make sure the file will be readable on the server.
       chmod a+r ${x}
       # Copy it.
-      ${SCP} ${x} ${FTP_PATH} || \
-        error "Could not upload ${x}"
+      if [ $LOCAL -eq 0 ]; then
+        ${SCP} ${x} ${UPLOAD_PATH} || error "Could not upload ${x}"
+      fi
     fi
   done
 }