summaryrefslogtreecommitdiff
path: root/scripts
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 14:40:38 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 14:40:38 (UTC)
commite61e994abb9738d98447b203b9908793da6f560a (patch) (unidiff)
treec12d695420bb6281708b367d52970eac5615ef1c /scripts
parent65a7a7be3feb846d6b1062a0b858a7660e8f99fa (diff)
parent24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5 (diff)
downloadclipperz-e61e994abb9738d98447b203b9908793da6f560a.zip
clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.gz
clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.bz2
Merge branch 'buildScript' of https://github.com/jokajak/password-manager
Conflicts: scripts/builder/repository.py Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Diffstat (limited to 'scripts') (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/builder/repository.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 9da98a2..f8528c2 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -6,3 +6,3 @@ def repositoryWithPath (path):
6 try: 6 try:
7 from dulwich.repo import Repo 7 from git import Repo
8 8
@@ -10,3 +10,5 @@ def repositoryWithPath (path):
10 result = GitRepository(repo, path) 10 result = GitRepository(repo, path)
11 except: 11 except ImportError:
12 print "Failed to import git, please install http://gitorious.org/git-python"
13 #except:
12 from mercurial import ui, hg 14 from mercurial import ui, hg
@@ -52,4 +54,4 @@ class GitRepository(Repository):
52 def revision (self): 54 def revision (self):
53 return self.repository.refs['HEAD'] 55 return self.repository.head.commit.hexsha
54 56
55 57