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

Unified Diff: gcl.py

Issue 150114: Fix 'gcl help' when not run inside a svn checkout. (Closed)
Patch Set: Created 11 years, 6 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: gcl.py
diff --git a/gcl.py b/gcl.py
index 09f6b7b3b2a1171835162357ac862906b1db7b51..054126758b5cf39ca7dc823710c0625e2517202b 100755
--- a/gcl.py
+++ b/gcl.py
@@ -96,7 +96,7 @@ def GetRepositoryRoot():
infos = gclient.CaptureSVNInfo(os.getcwd(), print_error=False)
cur_dir_repo_root = infos.get("Repository Root")
if not cur_dir_repo_root:
- raise Exception("gcl run outside of repository")
+ raise gclient.Error("gcl run outside of repository")
REPOSITORY_ROOT = os.getcwd()
while True:
@@ -138,7 +138,10 @@ def GetCachedFile(filename, max_age=60*60*24*3, use_root=False):
# Don't try to look up twice.
FILES_CACHE[filename] = None
# First we check if we have a cached version.
- cached_file = os.path.join(GetCacheDir(), filename)
+ try:
+ cached_file = os.path.join(GetCacheDir(), filename)
+ except gclient.Error:
+ return None
if (not os.path.exists(cached_file) or
os.stat(cached_file).st_mtime > max_age):
dir_info = gclient.CaptureSVNInfo(".")
@@ -1099,21 +1102,25 @@ def main(argv=None):
Help()
return 0;
- # Create the directories where we store information about changelists if it
- # doesn't exist.
- if not os.path.exists(GetInfoDir()):
- os.mkdir(GetInfoDir())
- if not os.path.exists(GetChangesDir()):
- os.mkdir(GetChangesDir())
- # For smooth upgrade support, move the files in GetInfoDir() to
- # GetChangesDir().
- # TODO(maruel): Remove this code in August 2009.
- for file in os.listdir(unicode(GetInfoDir())):
- file_path = os.path.join(unicode(GetInfoDir()), file)
- if os.path.isfile(file_path) and file != CODEREVIEW_SETTINGS_FILE:
- shutil.move(file_path, GetChangesDir())
- if not os.path.exists(GetCacheDir()):
- os.mkdir(GetCacheDir())
+ try:
+ # Create the directories where we store information about changelists if it
+ # doesn't exist.
+ if not os.path.exists(GetInfoDir()):
+ os.mkdir(GetInfoDir())
+ if not os.path.exists(GetChangesDir()):
+ os.mkdir(GetChangesDir())
+ # For smooth upgrade support, move the files in GetInfoDir() to
+ # GetChangesDir().
+ # TODO(maruel): Remove this code in August 2009.
+ for file in os.listdir(unicode(GetInfoDir())):
+ file_path = os.path.join(unicode(GetInfoDir()), file)
+ if os.path.isfile(file_path) and file != CODEREVIEW_SETTINGS_FILE:
+ shutil.move(file_path, GetChangesDir())
+ if not os.path.exists(GetCacheDir()):
+ os.mkdir(GetCacheDir())
+ except gclient.Error:
+ # Will throw an exception if not run in a svn checkout.
+ pass
# Commands that don't require an argument.
command = argv[1]
« 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