From 734eb907c321ad641c780be1a5343f34f777bc4b Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Thu, 30 Apr 2015 17:23:30 -0700 Subject: [PATCH] clone/update: match more svn URLs We may want to optimize svn fetches at some point and need the fetch code to work internally against an svn file: URL. Allow it to do so without exposing such to end users by not changing the strict checks in Util.pm valid_repo_url. Signed-off-by: Kyle J. McKay --- jobd/update.sh | 2 +- taskd/clone.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jobd/update.sh b/jobd/update.sh index 7e1a346..452ea5d 100755 --- a/jobd/update.sh +++ b/jobd/update.sh @@ -131,7 +131,7 @@ bang_eval "git for-each-ref --format '%(refname) %(objectname)' >.refs-temp" bang_eval "LC_ALL=C sort -k1b,1 <.refs-temp >.refs-before" case "$url" in - svn://* | svn+http://* | svn+https://*) + svn://* | svn+http://* | svn+https://* | svn+file://*) [ -n "$cfg_mirror_svn" ] || { echo "Mirroring svn is disabled" >&2; exit 0; } # Use an 'anonsvn' username as is commonly used for anonymous svn # Use an 'anonsvn' password as is commonly used for anonymous svn diff --git a/taskd/clone.sh b/taskd/clone.sh index 6242994..2b09864 100755 --- a/taskd/clone.sh +++ b/taskd/clone.sh @@ -140,7 +140,7 @@ headref= showheadwarn= warnempty= case "$url" in - svn://* | svn+http://* | svn+https://*) + svn://* | svn+http://* | svn+https://* | svn+file://*) [ -n "$cfg_mirror_svn" ] || { echo "Mirroring svn is disabled" >&2; exit 1; } # We just remove svn+ here, so svn+http://... becomes http://... # We also remove a trailing '/' to match what git-svn will do -- 2.11.4.GIT