* gcc_release: Revert change to -p interface. Allow for local and

	remote cases in creating directories.  Give an error if -p
	argument names a directory.

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

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index de0ecd8..4d93cf5 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-23  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * gcc_release: Revert change to -p interface.  Allow for local and
+       remote cases in creating directories.  Give an error if -p
+       argument names a directory.
+

 2002-02-21  Mark Mitchell  <mark@codesourcery.com>
 
        * gcc_release: Correct handling of diff-generation.  Add
 2002-02-21  Mark Mitchell  <mark@codesourcery.com>
 
        * gcc_release: Correct handling of diff-generation.  Add

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index bfe7fab..7e487e0 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -294,7 +294,7 @@ build_tarfiles() {
 
 # Build diffs against an old release.
 build_diffs() {
 
 # Build diffs against an old release.
 build_diffs() {

-  old_dir=${1%/}
+  old_dir=${1%/*}

   old_file=${1##*/}
   old_vers=${old_file%.tar.gz}
   old_vers=${old_vers#gcc-}
   old_file=${1##*/}
   old_vers=${old_file%.tar.gz}
   old_vers=${old_vers#gcc-}


@@ -334,13 +334,14 @@ upload_files() {
 
   changedir "${WORKING_DIRECTORY}"
 
 
   changedir "${WORKING_DIRECTORY}"
 

-  if [ $LOCAL -ne 0 ]; then
+  # Make sure the directory exists on the server.
+  if [ $LOCAL -eq 0 ]; then
+    ${SSH} -l ${GCC_USERNAME} ${GCC_HOSTNAME} mkdir ${FTP_PATH}
+  else

     mkdir -p "${FTP_PATH}" \
       || error "Could not create \`${FTP_PATH}'"
   fi
 
     mkdir -p "${FTP_PATH}" \
       || error "Could not create \`${FTP_PATH}'"
   fi
 

-  # Make sure the directory exists on the server.
-  ${SSH} -l ${GCC_USERNAME} ${GCC_HOSTNAME} mkdir ${FTP_PATH}

   for x in gcc*.gz gcc*.bz2; do
     if [ -e ${x} ]; then
       # Make sure the file will be readable on the server.
   for x in gcc*.gz gcc*.bz2; do
     if [ -e ${x} ]; then
       # Make sure the file will be readable on the server.


@@ -463,7 +464,10 @@ while getopts "d:fr:u:t:p:sl" ARG; do
          SCP=cp
          FTP_PATH=~ftp/pub/gcc
          PATH=~:/usr/local/bin:$PATH;;
          SCP=cp
          FTP_PATH=~ftp/pub/gcc
          PATH=~:/usr/local/bin:$PATH;;

-    p)    OLD_TARS="${OLD_TARS} ${OPTARG}";;
+    p)    OLD_TARS="${OLD_TARS} ${OPTARG}"
+          if [ -d ${OPTARG} ]; then
+           error "-p argument must name a tarball"
+         fi;;

     \?)   usage;;
     esac
 done
     \?)   usage;;
     esac
 done