clipperz/password-manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'buildScript' of https://github.com/jokajak/password-manager

Browse Source 
Conflicts:
	scripts/builder/repository.py

Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
This commit is contained in:
Giulio Cesare Solaroli
2012-03-17 14:40:38 +00:00
parent 65a7a7be3f 24f7bfcbe3
commit e61e994abb
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/php/properties/php.properties.json
View File

@@ -1,6 +1,6 @@
{ {
"request.path": "index.php", "request.path": "index.php",
"should.pay.toll": "false" "should.pay.toll": "false",
"development.settings": { "development.settings": {
"url": "http://localhost/php/clipperz" "url": "http://localhost/php/clipperz"

8
scripts/builder/repository.py
View File

@@ -4,11 +4,13 @@
def repositoryWithPath (path): def repositoryWithPath (path):
try: try:
from dulwich.repo import Repo from git import Repo
repo = Repo(path) repo = Repo(path)
result = GitRepository(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 from mercurial import ui, hg
repo = hg.repository(ui.ui(), path) repo = hg.repository(ui.ui(), path)
@@ -50,7 +52,7 @@ class Repository(object):
class GitRepository(Repository): class GitRepository(Repository):
def revision (self): def revision (self):
return self.repository.refs['HEAD'] return self.repository.head.commit.hexsha
def areTherePendingChanges (self): def areTherePendingChanges (self):