Index: deps2git.py |
diff --git a/deps2git.py b/deps2git.py |
index d40544974a4091be320a4ef4ee1fa64cf9da6e44..381ef2c9a0fad064f8e30405dc4f3aedadfb34c0 100755 |
--- a/deps2git.py |
+++ b/deps2git.py |
@@ -65,7 +65,8 @@ def SplitScmUrl(url): |
def SvnRevToGitHash( |
svn_rev, git_url, repos_path, workspace, dep_path, git_host, |
- svn_branch_name=None, cache_dir=None, outbuf=None, shallow=None): |
+ svn_branch_name=None, cache_dir=None, outbuf=None, shallow=None, |
+ print_fn=None): |
"""Convert a SVN revision to a Git commit id.""" |
git_repo = None |
if git_url.startswith(git_host): |
@@ -85,7 +86,7 @@ def SvnRevToGitHash( |
git_tools.Clone(git_url, git_repo_path, mirror, outbuf) |
elif cache_dir: |
mirror = True |
- git_repo_path = git_tools.PopulateCache(git_url, shallow) |
+ git_repo_path = git_tools.PopulateCache(git_url, shallow, print_fn=print_fn) |
else: |
mirror = False |
git_repo_path = os.path.join(workspace, dep_path) |
@@ -189,7 +190,7 @@ def ConvertDepMain(dep_q, message_q, options, results): |
try: |
git_hash = '@%s' % SvnRevToGitHash( |
dep_rev, git_url, options.repos, options.workspace, path, |
- git_host, svn_branch, options.cache_dir) |
+ git_host, svn_branch, options.cache_dir, print_fn=_print) |
except Exception as e: |
if options.no_fail_fast: |
results.bad_git_hash.append(e) |