From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 12 Jul 2016 16:14:29 +0000 (+0000)
Subject: build_clone: Move git_massage_url to build_url_vcs
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ccf964a0de545ffd66e6bdc44c4fe20d9987e93e;p=people%2Fiwj%2Fosstest.git

build_clone: Move git_massage_url to build_url_vcs

The effect is that ts-xen-build (the only other caller of
build_url_vcs) now gets the massaged rather than unmassaged urls.

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

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 485a29a0..d0d6ef3a 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1287,6 +1287,10 @@ sub build_url_vcs ($) {
 	}
     }
 
+    if (($vcs // '<unknown>') eq 'git') {
+	$tree = git_massage_url($tree);
+    }
+
     return ($tree, $vcs);
 }
 
@@ -1314,11 +1318,9 @@ END
 END
     } elsif ($vcs eq 'git') {
 
-	my $eff_tree = git_massage_url($tree);
-
         target_cmd_build($ho, $timeout, $builddir, <<END.
             $rm
-            git clone '$eff_tree' $subdir
+            git clone '$tree' $subdir
             cd $subdir
 END
                          (length($r{"revision_$which"}) ? <<END : ''));