author | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 15:11:14 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 15:11:14 (UTC) |
commit | 6f7ead0446aae6dd9f40b183e402b059a33d0517 (patch) (unidiff) | |
tree | 5eee397439e3af31c8fe7f96a22ea11c234bd4a8 /scripts | |
parent | 58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a (diff) | |
parent | bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7 (diff) | |
download | clipperz-6f7ead0446aae6dd9f40b183e402b059a33d0517.zip clipperz-6f7ead0446aae6dd9f40b183e402b059a33d0517.tar.gz clipperz-6f7ead0446aae6dd9f40b183e402b059a33d0517.tar.bz2 |
Merge pull request #32 from gcsolaroli/master
Improved build scripts
-rw-r--r-- | scripts/builder/repository.py | 18 |
1 files 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 | |||
@@ -5,15 +5,18 @@ | |||
5 | def repositoryWithPath (path): | 5 | def repositoryWithPath (path): |
6 | try: | 6 | try: |
7 | from git import Repo | ||
8 | |||
9 | repo = Repo(path) | ||
10 | result = GitRepository(repo, path) | ||
11 | except ImportError: | ||
12 | print "Failed to import git, please install http://gitorious.org/git-python" | ||
13 | #except: | ||
14 | from mercurial import ui, hg | 7 | from mercurial import ui, hg |
15 | 8 | ||
16 | repo = hg.repository(ui.ui(), path) | 9 | repo = hg.repository(ui.ui(), path) |
17 | result = HgRepository(repo, path) | 10 | result = HgRepository(repo, path) |
11 | except: | ||
12 | try: | ||
13 | from git import Repo | ||
14 | |||
15 | repo = Repo(path) | ||
16 | result = GitRepository(repo, path) | ||
17 | except ImportError, exception: | ||
18 | print "Failed to import git, please install http://gitorious.org/git-python" | ||
19 | raise exception | ||
20 | |||
18 | 21 | ||
19 | return result | 22 | return result |
@@ -51,4 +54,5 @@ class Repository(object): | |||
51 | 54 | ||
52 | class GitRepository(Repository): | 55 | class GitRepository(Repository): |
56 | #http://gitorious.org/git-python | ||
53 | 57 | ||
54 | def revision (self): | 58 | def revision (self): |