summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-03-06 18:48:02 +0000
committergjb <gjb@FreeBSD.org>2014-03-06 18:48:02 +0000
commit4f9a1ea514e7152874e5454ca0eb02fefc769e3c (patch)
tree8d9b644485c61fa065974b6141d0ef06d06c6938 /release
parent1e800dd8ab05cb2ace3c61684e7d9ece5dc68e9e (diff)
downloadFreeBSD-src-4f9a1ea514e7152874e5454ca0eb02fefc769e3c.zip
FreeBSD-src-4f9a1ea514e7152874e5454ca0eb02fefc769e3c.tar.gz
Add a hack-ish attempt to provide backwards-compatibility with
release.conf SVNROOT entries that do not have a trailing '/'. In order to provide a mechanism to use !svn, the trailing '/' was added to SVNROOT so there were no assumptions being made about '/' being in the URL between SVNROOT and SRCBRANCH. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rwxr-xr-xrelease/release.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/release/release.sh b/release/release.sh
index c419d59..b742829 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -107,6 +107,16 @@ while getopts c: opt; do
done
shift $(($OPTIND - 1))
+# Fix for backwards-compatibility with release.conf that does not have the
+# trailing '/'.
+case ${SVNROOT} in
+ *svn*)
+ SVNROOT="${SVNROOT}/"
+ ;;
+ *)
+ ;;
+esac
+
# Prefix the branches with the SVNROOT for the full checkout URL.
SRCBRANCH="${SVNROOT}${SRCBRANCH}"
DOCBRANCH="${SVNROOT}${DOCBRANCH}"
OpenPOWER on IntegriCloud