[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9f9f57c55370c74d1dd74fb6000a98f949327cf6
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 13:13:41 2010 +0000

    Catch exceptions when checking if we're inside a git working directory
    
    Fixes <http://webkit.org/b/48420> REGRESSION (r70562): test-webkitpy
    fails on systems without git installed
    
    Reviewed by Anders Carlsson.
    
    * Scripts/webkitpy/common/net/credentials.py:
    (Credentials._credentials_from_git): Put the call to
    Git.in_working_directory inside the try/except since it, too, attempts
    to execute git and thus will throw on systems that don't have git
    installed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70640 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d4b1fb3..da5e2f4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-27  Adam Roben  <aroben at apple.com>
+
+        Catch exceptions when checking if we're inside a git working directory
+
+        Fixes <http://webkit.org/b/48420> REGRESSION (r70562): test-webkitpy
+        fails on systems without git installed
+
+        Reviewed by Anders Carlsson.
+
+        * Scripts/webkitpy/common/net/credentials.py:
+        (Credentials._credentials_from_git): Put the call to
+        Git.in_working_directory inside the try/except since it, too, attempts
+        to execute git and thus will throw on systems that don't have git
+        installed.
+
 2010-10-27  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/Scripts/webkitpy/common/net/credentials.py b/WebKitTools/Scripts/webkitpy/common/net/credentials.py
index 64096d8..30480b3 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/credentials.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/credentials.py
@@ -59,9 +59,9 @@ class Credentials(object):
         self._keyring = keyring
 
     def _credentials_from_git(self):
-        if not Git.in_working_directory(self.cwd):
-            return (None, None)
         try:
+            if not Git.in_working_directory(self.cwd):
+                return (None, None)
             return (Git.read_git_config(self.git_prefix + "username"),
                     Git.read_git_config(self.git_prefix + "password"))
         except OSError, e:

-- 
WebKit Debian packaging