mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib-git-svn.sh: Avoid setting web server variables unnecessarily

Browse Source 
If the SVN_HTTPD_PORT variable is not set, then we will not even
attempt to start a web server in the start_httpd function (despite
it's name), so there is no need to determine values for the
SVN_HTTPD_PATH and SVN_HTTPD_MODULE_PATH variables.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramsay Jones
2010-12-14 18:22:29 +00:00
committed by Junio C Hamano
parent 531dd7bbf4
commit b6fe97483f
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
t/lib-git-svn.sh
View File

@ -68,28 +68,31 @@ svn_cmd () {
svn "$orig_svncmd" --config-dir "$svnconf" "$@" svn "$orig_svncmd" --config-dir "$svnconf" "$@"
} }
for d in \ if test -n "$SVN_HTTPD_PORT"
then
for d in \
"$SVN_HTTPD_PATH" \ "$SVN_HTTPD_PATH" \
/usr/sbin/apache2 \ /usr/sbin/apache2 \
/usr/sbin/httpd \ /usr/sbin/httpd \
; do ; do
if test -f "$d" if test -f "$d"
then then
SVN_HTTPD_PATH="$d" SVN_HTTPD_PATH="$d"
break break
fi fi
done done
for d in \ for d in \
"$SVN_HTTPD_MODULE_PATH" \ "$SVN_HTTPD_MODULE_PATH" \
/usr/lib/apache2/modules \ /usr/lib/apache2/modules \
/usr/libexec/apache2 \ /usr/libexec/apache2 \
; do ; do
if test -d "$d" if test -d "$d"
then then
SVN_HTTPD_MODULE_PATH="$d" SVN_HTTPD_MODULE_PATH="$d"
break break
fi fi
done done
fi
start_httpd () { start_httpd () {
repo_base_path="$1" repo_base_path="$1"