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>

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):
         try:
-                from dulwich.repo import Repo
+                from git import Repo
 
@@ -10,3 +10,5 @@ def repositoryWithPath (path):
                 result = GitRepository(repo, path)
-        except:
+        except ImportError:
+                print "Failed to import git, please install http://gitorious.org/git-python"
+        #except:
                 from mercurial import ui, hg
@@ -52,4 +54,4 @@ class GitRepository(Repository):
         def revision (self):
-                return self.repository.refs['HEAD']
-        
+                return self.repository.head.commit.hexsha
+