commit 93a9ee0f72a9d2c8eca0a0caff0b875ab2fff31e
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Oct 18 18:23:58 2011 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Oct 18 18:23:58 2011 +0000
tree 3ac9ddec5d50e47fdcf669f150cc5d577987ba8d
parent b9be065ac1a1506571432fdf4a672d1bcd9a2a25

gclient would crash when .gclient is not found.

Fix a problem introduced in r105229.

R=cmp@chromium.org
BUG=
TEST=


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

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

gclient_utils.py

diff --git a/gclient_utils.py b/gclient_utils.py
index 637b995..0dcef9d 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -452,12 +452,11 @@
 def GetGClientRootAndEntries(path=None):
   """Returns the gclient root and the dict of entries."""
   config_file = '.gclient_entries'
-  config_path = os.path.join(FindFileUpwards(config_file, path), config_file)
-
-  if not config_path:
+  root = FindFileUpwards(config_file, path)
+  if not root:
     print "Can't find %s" % config_file
     return None
-
+  config_path = os.path.join(root, config_file)
   env = {}
   execfile(config_path, env)
   config_dir = os.path.dirname(config_path)