Changeset 70640 in webkit

Timestamp:

Oct 27, 2010 6:13:41 AM (14 years ago)

Author:

Adam Roben

Message:

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.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/credentials.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-27  Adam Roben  <aroben@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@rim.com>
 

trunk/WebKitTools/Scripts/webkitpy/common/net/credentials.py

@@ -60 +60 @@
 
     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"))