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>
Ramsay Jones committed
Dec 14, 2010 at 18:22 UTC
b6fe97483fdfec2176cf17dd38821cad0200a126
1 file changed
+25
-22
t/lib-git-svn.sh
+25
-22
@@ -68,28 +68,31 @@ svn_cmd () {
68
svn "$orig_svncmd" --config-dir "$svnconf" "$@"
69
}
70
71
-for d in \
72
- "$SVN_HTTPD_PATH" \
73
- /usr/sbin/apache2 \
74
- /usr/sbin/httpd \
75
-; do
76
- if test -f "$d"
77
- then
78
- SVN_HTTPD_PATH="$d"
79
- break
80
- fi
81
-done
82
-for d in \
83
- "$SVN_HTTPD_MODULE_PATH" \
84
- /usr/lib/apache2/modules \
85
- /usr/libexec/apache2 \
86
-; do
87
- if test -d "$d"
88
- then
89
- SVN_HTTPD_MODULE_PATH="$d"
90
- break
91
- fi
92
-done
71
+if test -n "$SVN_HTTPD_PORT"
72
+then
73
+ for d in \
74
+ "$SVN_HTTPD_PATH" \
75
+ /usr/sbin/apache2 \
76
+ /usr/sbin/httpd \
77
+ ; do
78
+ if test -f "$d"
79
+ then
80
+ SVN_HTTPD_PATH="$d"
81
+ break
82
+ fi
83
+ done
84
+ for d in \
85
+ "$SVN_HTTPD_MODULE_PATH" \
86
+ /usr/lib/apache2/modules \
87
+ /usr/libexec/apache2 \
88
+ ; do
89
+ if test -d "$d"
90
+ then
91
+ SVN_HTTPD_MODULE_PATH="$d"
92
+ break
93
+ fi
94
+ done
95
+fi
96
97
start_httpd () {
98
repo_base_path="$1"