From bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Sat, 17 Mar 2012 15:10:02 +0000 Subject: [PATCH] Improved build scripts Improved the detection of the correct repository class to use. Signed-off-by: Giulio Cesare Solaroli --- scripts/builder/repository.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index f8528c2..0045de7 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py @@ -4,17 +4,20 @@ def repositoryWithPath (path): try: - from git import Repo - - repo = Repo(path) - result = GitRepository(repo, path) - except ImportError: - print "Failed to import git, please install http://gitorious.org/git-python" -# except: from mercurial import ui, hg repo = hg.repository(ui.ui(), path) result = HgRepository(repo, path) + except: + try: + from git import Repo + + repo = Repo(path) + result = GitRepository(repo, path) + except ImportError, exception: + print "Failed to import git, please install http://gitorious.org/git-python" + raise exception + return result @@ -50,6 +53,7 @@ class Repository(object): class GitRepository(Repository): + # http://gitorious.org/git-python def revision (self): return self.repository.head.commit.hexsha