summaryrefslogtreecommitdiff
path: root/scripts
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 15:10:02 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 15:10:02 (UTC)
commitbf7d8191a3a6dbd092a88911098a3e7f6cf30cf7 (patch) (side-by-side diff)
tree5eee397439e3af31c8fe7f96a22ea11c234bd4a8 /scripts
parente61e994abb9738d98447b203b9908793da6f560a (diff)
downloadclipperz-bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7.zip
clipperz-bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7.tar.gz
clipperz-bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7.tar.bz2
Improved build scripts
Improved the detection of the correct repository class to use. Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Diffstat (limited to 'scripts') (more/less context) (show whitespace changes)
-rw-r--r--scripts/builder/repository.py14
1 files changed, 9 insertions, 5 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
@@ -6,2 +6,8 @@ def repositoryWithPath (path):
try:
+ from mercurial import ui, hg
+
+ repo = hg.repository(ui.ui(), path)
+ result = HgRepository(repo, path)
+ except:
+ try:
from git import Repo
@@ -10,9 +16,6 @@ def repositoryWithPath (path):
result = GitRepository(repo, path)
- except ImportError:
+ except ImportError, exception:
print "Failed to import git, please install http://gitorious.org/git-python"
-# except:
- from mercurial import ui, hg
+ raise exception
- repo = hg.repository(ui.ui(), path)
- result = HgRepository(repo, path)
@@ -52,2 +55,3 @@ class Repository(object):
class GitRepository(Repository):
+ # http://gitorious.org/git-python