X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/19b7cd172992a8dc97ee20064dd1d38c2c04072a..816ab94c6291c82226a9ebf09181e067d40cd743:/include/download.mk

diff --git a/include/download.mk b/include/download.mk
index 2d3f35fee..9dd26a744 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)/ && \
@@ -108,10 +104,10 @@ define DownloadMethod/bzr
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		bzr export -r$(VERSION) $(URL) $(SUBDIR) && \
+		bzr export -r$(VERSION) $(SUBDIR) $(URL) && \
 		echo "Packing checkout..." && \
 		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ &&
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
 	)
 endef