From e24a6b02af479c5487e8280c2291d53a4fa68fb4 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 22 Jul 2013 22:23:54 +0000 Subject: [PATCH] Fix revision.py detection of git checkouts git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1329 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/revision.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/revision.py b/tools/revision.py index 1096c12dd..1d946029f 100644 --- a/tools/revision.py +++ b/tools/revision.py @@ -4,6 +4,7 @@ import svn_util as svn import git_util as git +import os import sys # cannot be loaded as a module @@ -11,9 +12,11 @@ if __name__ != "__main__": sys.stderr.write('This file cannot be loaded as a module!') sys.exit() -try: +if os.path.exists(os.path.join('.', '.svn')): sys.stdout.write(svn.get_revision()) -except: +elif os.path.exists(os.path.join('.', '.git')): sys.stdout.write(git.get_svn_revision()) +else: + raise Exception('Not a valid checkout')