Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(841)

Unified Diff: tools/find_depot_tools.py

Issue 137203009: Check that directory named depot_tools appears to be full checkout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stupid reitveld Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/find_depot_tools.py
diff --git a/tools/find_depot_tools.py b/tools/find_depot_tools.py
index 0fa151b162c8da3f599ff461024f9cc3e46212a2..976372253cb5c58cbe2afa46653656f710146f15 100644
--- a/tools/find_depot_tools.py
+++ b/tools/find_depot_tools.py
@@ -10,22 +10,27 @@ imports breakpad.
import os
import sys
+
+def IsRealDepotTools(path):
+ return os.path.isfile(os.path.join(path, 'breakpad.py'))
+
+
def add_depot_tools_to_path():
"""Search for depot_tools and add it to sys.path."""
# First look if depot_tools is already in PYTHONPATH.
for i in sys.path:
- if i.rstrip(os.sep).endswith('depot_tools'):
+ if i.rstrip(os.sep).endswith('depot_tools') and IsRealDepotTools(i):
return i
# Then look if depot_tools is in PATH, common case.
for i in os.environ['PATH'].split(os.pathsep):
- if i.rstrip(os.sep).endswith('depot_tools'):
+ if i.rstrip(os.sep).endswith('depot_tools') and IsRealDepotTools(i):
sys.path.append(i.rstrip(os.sep))
return i
# Rare case, it's not even in PATH, look upward up to root.
root_dir = os.path.dirname(os.path.abspath(__file__))
previous_dir = os.path.abspath(__file__)
while root_dir and root_dir != previous_dir:
- if os.path.isfile(os.path.join(root_dir, 'depot_tools', 'breakpad.py')):
+ if IsRealDepotTools(os.path.join(root_dir, 'depot_tools')):
i = os.path.join(root_dir, 'depot_tools')
Paweł Hajdan Jr. 2014/01/22 03:27:30 While you're here, let's deduplicate "os.path.join
scottmg 2014/01/22 05:05:36 Done.
sys.path.append(i)
return i
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698