aboutsummaryrefslogtreecommitdiff
path: root/maintainer-scripts
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@pfeifer.com>2004-03-27 01:20:45 +0000
committerGerald Pfeifer <gerald@gcc.gnu.org>2004-03-27 01:20:45 +0000
commitaaaf25eba87ec284a39da793c95b78868ba8af4f (patch)
treea94ca4889237b7909bc33a5264205e8c1db2fb0e /maintainer-scripts
parent8c7555a5b6e5e162a352aff233f5278fe1c62349 (diff)
downloadgcc-aaaf25eba87ec284a39da793c95b78868ba8af4f.zip
gcc-aaaf25eba87ec284a39da793c95b78868ba8af4f.tar.gz
gcc-aaaf25eba87ec284a39da793c95b78868ba8af4f.tar.bz2
gcc_release: Fix sanity check for argument of -p command-line options.
* 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. From-SVN: r80009
Diffstat (limited to 'maintainer-scripts')
-rw-r--r--maintainer-scripts/ChangeLog6
-rwxr-xr-xmaintainer-scripts/gcc_release9
2 files changed, 11 insertions, 4 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 43f5291..13bd6ed 100644
--- 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
--- 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