commit 873e6672e1ca87d3db86bf29d85b496a3e07a553
author szager@google.com <szager@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Tue Mar 13 18:53:36 2012 +0000
committer szager@google.com <szager@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Tue Mar 13 18:53:36 2012 +0000
tree e35fd91023089a9b552dbc2cee0aef353da6b369
parent b9a78d31ba8cb820d1099d8b98c95623d1a8427a

If a subdir exists and is empty, go ahead and clone into it.

This will make it easier to support git-submodule and gclient at
the same time.

Review URL: http://codereview.chromium.org/9692022

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@126428 0039d316-1c4b-4281-b951-d872f2087c98

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 881b7f0..e8c1711 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -219,7 +219,9 @@
       # hash is also a tag, only make a distinction at checkout
       rev_type = "hash"
 
-    if not os.path.exists(self.checkout_path):
+    if not os.path.exists(self.checkout_path) or (
+        os.path.isdir(self.checkout_path) and
+        not os.listdir(self.checkout_path)):
       gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
       self._Clone(revision, url, options)
       files = self._Capture(['ls-files']).splitlines()