Always return a tuple from GIT.Capture

scm.py

 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """SCM-specific utility classes."""
 
 import glob
 import os
 import re
 import shutil
@@ skipping 42 matching lines @@
 
     Returns:
       The output sent to stdout as a string.
     """
     c = [GIT.COMMAND]
     c.extend(args)
     try:
       return gclient_utils.CheckCall(c, in_directory, print_error)
     except gclient_utils.CheckCallError:
       if error_ok:
-        return ''
+        return ('', '')
       raise
 
   @staticmethod
   def CaptureStatus(files, upstream_branch='origin'):
     """Returns git status.
 
     @files can be a string (one file) or a list of files.
 
     Returns an array of (status, file) tuples."""
     command = ["diff", "--name-status", "-r", "%s.." % upstream_branch]
@@ skipping 659 matching lines @@
     if not cur_dir_repo_root:
       return None
 
     while True:
       parent = os.path.dirname(directory)
       if (SVN.CaptureInfo(parent, print_error=False).get(
               "Repository Root") != cur_dir_repo_root):
         break
       directory = parent
     return GetCasedPath(directory)