[PATCH 4 of 7] scripts/functions: cvs retrival first tries the mirror for tarballs

["Yann E. MORIN" <yann dot morin dot 1998 at anciens dot enib dot fr>]

 scripts/functions |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1312302413 -7200
# Node ID 8dd5af369141b2590279bfc6ed1fa8d0b4e6cca5
# Parent  79452944e062f55b11549053632762e1ce937c58
scripts/functions: cvs retrival first tries the mirror for tarballs

The cvs 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 cvs.

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 cvs retrieval will kick in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/functions b/scripts/functions
--- a/scripts/functions
+++ b/scripts/functions
@@ -590,11 +590,11 @@
     local dirname="$5"
     local tmp_dir
 
-    # 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}"

--
For unsubscribe information see http://sourceware.org/lists.html#faq