svn commit: r262862 - head/release

Glen Barber gjb at FreeBSD.org
Thu Mar 6 18:48:03 UTC 2014


Author: gjb
Date: Thu Mar  6 18:48:02 2014
New Revision: 262862
URL: http://svnweb.freebsd.org/changeset/base/262862

Log:
  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

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Thu Mar  6 18:30:56 2014	(r262861)
+++ head/release/release.sh	Thu Mar  6 18:48:02 2014	(r262862)
@@ -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}"


More information about the svn-src-all mailing list