| 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) (side-by-side diff) | |
| 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 @@ -1,25 +1,28 @@ #!/usr/bin/env python # -*- coding: UTF-8 -*- 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 #=================================================================== class Repository(object): @@ -45,16 +48,17 @@ class Repository(object): # print "VERSION: " + result return result #=================================================================== class GitRepository(Repository): + # http://gitorious.org/git-python def revision (self): return self.repository.head.commit.hexsha def areTherePendingChanges (self): return self.repository.is_dirty() |