From 5f79506725b2b4c8e26274e8c53ddddcb8f9929f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 2 Aug 2011 18:28:10 +0200
Subject: scripts/functions: svn retrieval first tries the mirror for tarballs

The svn download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via svn.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard svn retrieval will kick in.

Reported-by: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/functions b/scripts/functions
index 199aa57..c80eecd 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -629,11 +629,11 @@ CT_GetSVN() {
     local uri="$2"
     local rev="$3"
 
-    # Does it exist localy?
-    CT_GetLocal "${basename}" && return 0 || true
-    # No, it does not...
-
-    CT_DoLog EXTRA "Retrieving '${basename}'"
+    # First try locally, then the mirror
+    if CT_GetFile "${basename}"; then
+        # Got it! Return early! :-)
+        return 0
+    fi
 
     CT_MktempDir tmp_dir
     CT_Pushd "${tmp_dir}"
-- 
cgit v0.10.2-6-g49f6