diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-12-14 18:22:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 19:09:13 (GMT) |
| commit | b6fe97483fdfec2176cf17dd38821cad0200a126 (patch) | |
| tree | fb8a41d2719504c99a24c5045b51da2a5c4fcc6b /t/lib-git-svn.sh | |
| parent | 531dd7bbf4e579334cddb5be54af94c8d339df10 (diff) | |
| download | git-b6fe97483fdfec2176cf17dd38821cad0200a126.zip git-b6fe97483fdfec2176cf17dd38821cad0200a126.tar.gz git-b6fe97483fdfec2176cf17dd38821cad0200a126.tar.bz2 | |
lib-git-svn.sh: Avoid setting web server variables unnecessarily
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>
Diffstat (limited to 't/lib-git-svn.sh')
| -rw-r--r-- | t/lib-git-svn.sh | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 92d6d31..919d45a 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -68,28 +68,31 @@ svn_cmd () { svn "$orig_svncmd" --config-dir "$svnconf" "$@" } -for d in \ - "$SVN_HTTPD_PATH" \ - /usr/sbin/apache2 \ - /usr/sbin/httpd \ -; do - if test -f "$d" - then - SVN_HTTPD_PATH="$d" - break - fi -done -for d in \ - "$SVN_HTTPD_MODULE_PATH" \ - /usr/lib/apache2/modules \ - /usr/libexec/apache2 \ -; do - if test -d "$d" - then - SVN_HTTPD_MODULE_PATH="$d" - break - fi -done +if test -n "$SVN_HTTPD_PORT" +then + for d in \ + "$SVN_HTTPD_PATH" \ + /usr/sbin/apache2 \ + /usr/sbin/httpd \ + ; do + if test -f "$d" + then + SVN_HTTPD_PATH="$d" + break + fi + done + for d in \ + "$SVN_HTTPD_MODULE_PATH" \ + /usr/lib/apache2/modules \ + /usr/libexec/apache2 \ + ; do + if test -d "$d" + then + SVN_HTTPD_MODULE_PATH="$d" + break + fi + done +fi start_httpd () { repo_base_path="$1" |