Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)

New snapshot that includes the fix for installing the QtWebProcess into libexec

Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/Tools/Scripts/webkitpy/common/checkout/scm/detection.py b/Tools/Scripts/webkitpy/common/checkout/scm/detection.py
index 44bc9265d..e635b4075 100644
--- a/Tools/Scripts/webkitpy/common/checkout/scm/detection.py
+++ b/Tools/Scripts/webkitpy/common/checkout/scm/detection.py
@@ -27,14 +27,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import logging
+
 from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.common.system.executive import Executive
 
-from webkitpy.common.system.deprecated_logging import log
-
 from .svn import SVN
 from .git import Git
 
+_log = logging.getLogger(__name__)
+
 
 class SCMDetector(object):
     def __init__(self, filesystem, executive):
@@ -55,7 +57,7 @@ class SCMDetector(object):
             script_directory = self._filesystem.dirname(self._filesystem.path_to_module(self.__module__))
             scm_system = self.detect_scm_system(script_directory, patch_directories)
             if scm_system:
-                log("The current directory (%s) is not a WebKit checkout, using %s" % (cwd, scm_system.checkout_root))
+                _log.info("The current directory (%s) is not a WebKit checkout, using %s" % (cwd, scm_system.checkout_root))
             else:
                 raise Exception("FATAL: Failed to determine the SCM system for either %s or %s" % (cwd, script_directory))
         return scm_system