aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-03-23 01:21:50 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-03-23 01:21:50 +0000
commit693fc7f10f66c8c3995c7cbeea7606171e297b81 (patch)
treeb9888df901b26e990827e9a7221c49b336781315
parent00d06631c97e7909cb1540afb9a422dc5e04b901 (diff)
downloadupstream-693fc7f10f66c8c3995c7cbeea7606171e297b81.tar.gz
upstream-693fc7f10f66c8c3995c7cbeea7606171e297b81.tar.bz2
upstream-693fc7f10f66c8c3995c7cbeea7606171e297b81.zip
[include] the svn fallback code added in r20322 is evaluated with each make invocation and produces a lot of spurious "svn: broken pipe" error -
replace it with a more efficient version git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20377 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/download.mk10
1 files changed, 3 insertions, 7 deletions
diff --git a/include/download.mk b/include/download.mk
index 2d3f35fee9..c924ca0516 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -63,12 +63,6 @@ define DownloadMethod/cvs
)
endef
-SVN_VERSION=$(shell svn --version | head -1 | awk '{ print $3 }' | cut -d. -f2)
-ifeq ($(SVN_VERSION),5)
-else
-SVN_OPTS:=--trust-server-cert
-endif
-
define DownloadMethod/svn
$(call wrap_mirror, \
echo "Checking out files from the svn repository..."; \
@@ -76,7 +70,9 @@ define DownloadMethod/svn
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
- svn export --non-interactive $(SVN_OPTS) -r$(VERSION) $(URL) $(SUBDIR) && \
+ ( svn help export | grep -q trust-server-cert && \
+ svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
+ svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \