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>

2 files changed, 6 insertions, 4 deletions

diff --git a/backend/php/properties/php.properties.json b/backend/php/properties/php.properties.json
index 8ce703a..dd25b09 100644
--- a/backend/php/properties/php.properties.json
+++ b/backend/php/properties/php.properties.json
@@ -1,9 +1,9 @@
 {
 	"request.path": "index.php",
-	"should.pay.toll": "false"
+	"should.pay.toll": "false",
 
 	"development.settings": {
 		"url": "http://localhost/php/clipperz"
 	}
 
 }
\ No newline at end of file
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
@@ -1,17 +1,19 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 
 def repositoryWithPath (path):
 	try:
-		from dulwich.repo import Repo
+		from git import Repo
 
 		repo = Repo(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
 
 		repo = hg.repository(ui.ui(), path)
 		result = HgRepository(repo, path)
 
 	return result
@@ -47,13 +49,13 @@ class Repository(object):
 #===================================================================
 
 
 class GitRepository(Repository):
 
 	def revision (self):
-		return self.repository.refs['HEAD']
+		return self.repository.head.commit.hexsha
 	
 
 	def areTherePendingChanges (self):
 		return self.repository.is_dirty()