[OSSTEST PATCH 1/2] cri-common, ap-common: abstract out besteffort_repo

[OSSTEST PATCH 1/2] cri-common, ap-common: abstract out besteffort_repo

[Ian Jackson]

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ap-common  |    2 +-
 cri-common |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ap-common b/ap-common
index bca0fea..895ad62 100644
--- 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 9cbf0d8..06a8d67 100644
--- 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
-- 
1.7.10.4

[OSSTEST PATCH 2/2] ap-common: Use besteffort_repo for rumpsrc

[Ian Jackson]

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ap-common |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ap-common b/ap-common
index 895ad62..ba3a180 100644
--- a/ap-common
+++ b/ap-common
@@ -44,7 +44,7 @@
 : ${BASE_TREE_RUMPUSERXEN:=git://xenbits.xen.org/rumpuser-xen.git}
 : ${PUSH_TREE_RUMPUSERXEN:=$XENBITS:/home/xen/git/rumpuser-xen.git}
 
-: ${TREE_RUMPUSERXEN_RUMPSRC:=https://github.com/rumpkernel/rumpkernel-netbsd-src}
+: ${TREE_RUMPUSERXEN_RUMPSRC:=$(besteffort_repo https://github.com/rumpkernel/rumpkernel-netbsd-src)}
 : ${TREEVCS_RUMPUSERXEN_RUMPSRC:=git}
 
 : ${TREE_SEABIOS_UPSTREAM:=git://git.seabios.org/seabios.git}
-- 
1.7.10.4