* gcc_release: Correct upload handling.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53315 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index e4d37ce..732172a 100644 (file)
--- 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 298ac82..850525f 100755 (executable)
--- 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
 }