* gcc_release: Fix sanity check for argument of -p command-line

	options.  In snapshot mode, only generate diffs against the previous
	snapshot if the user did not specify any old tarball explictly.

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

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 43f5291..13bd6ed 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-27  Gerald Pfeifer  <gerald@pfeifer.com>
+
+       * gcc_release: Fix sanity check for argument of -p command-line
+       options.  In snapshot mode, only generate diffs against the previous
+       snapshot if the user did not specify any old tarball explictly.
+
 2004-03-25  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * gcc_release (FTP_PATH): Use /var/ftp instead of ~ftp, and

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index f625971..c21c1b9 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -540,7 +540,7 @@ while getopts "d:fr:u:t:p:s:l" ARG; do
          SCP=cp
          PATH=~:/usr/local/bin:$PATH;;
     p)    OLD_TARS="${OLD_TARS} ${OPTARG}"
-          if [ -d ${OPTARG} ]; then
+          if [ ! -f ${OPTARG} ]; then
            error "-p argument must name a tarball"
          fi;;
     \?)   usage;;
@@ -615,9 +615,10 @@ else
     TAG=gcc-ss-`echo ${RELEASE} | tr '.' '_'`
   fi
 
-  # Building locally on gcc.gnu.org, we know what the last snapshot date
-  # was.
-  if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ]; then
+  # If diffs are requested when building locally on gcc.gnu.org, we (usually)
+  # know what the last snapshot date was and take the corresponding tarballs,
+  # unless the user specified tarballs explictly.
+  if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ] && [ -z "${OLD_TARS}" ]; then
     LAST_DATE=`cat ~/.snapshot_date-${BRANCH}`
     OLD_TARS=${SNAPSHOTS_DIR}/${BRANCH}-${LAST_DATE}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
   fi