cri-common, ap-common: abstract out besteffort_repo

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/ap-common b/ap-common
index bca0feacbc7f4b8e34e338c13b9a3d620b48a68d..895ad62a52f5196e37e8b20f3cf6422f8c0416c5 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -37,7 +37,7 @@
 : ${PUSH_TREE_LIBVIRT:=$XENBITS:/home/xen/git/libvirt.git}
 : ${BASE_TREE_LIBVIRT:=git://xenbits.xen.org/libvirt.git}
 
-: ${TREE_GNULIB_LIBVIRT:=$(cached_repo git://git.sv.gnu.org/gnulib.git \[fetch=try\])}
+: ${TREE_GNULIB_LIBVIRT:=$(besteffort_repo git://git.sv.gnu.org/gnulib.git)}
 
 : ${TREE_RUMPUSERXEN:=https://github.com/rumpkernel/rumpuser-xen}
 : ${TREEVCS_RUMPUSERXEN:=git}

diff --git a/cri-common b/cri-common
index 9cbf0d84335f6ae8d9e281e149dc5af0db5b15d4..06a8d678d42756834c0dfd95312d3ef877737c53 100644 (file)
--- a/cri-common
+++ b/cri-common
@@ -33,6 +33,11 @@ cached_repo () {
        fi
 }
 
+besteffort_repo () {
+       local repo=$1
+       cached_repo "$1" '[fetch=try]'
+}
+
 repo_tree_rev_fetch_git () {
        local treename=$1
        local remoteurl=$2