| author | Giulio 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) |
| commit | e61e994abb9738d98447b203b9908793da6f560a (patch) (side-by-side diff) | |
| tree | c12d695420bb6281708b367d52970eac5615ef1c | |
| parent | 65a7a7be3feb846d6b1062a0b858a7660e8f99fa (diff) | |
| parent | 24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5 (diff) | |
| download | clipperz-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>
| -rw-r--r-- | backend/php/properties/php.properties.json | 4 | ||||
| -rw-r--r-- | scripts/builder/repository.py | 10 |
2 files changed, 8 insertions, 6 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 @@ -2,3 +2,3 @@ "request.path": "index.php", - "should.pay.toll": "false" + "should.pay.toll": "false", @@ -8,2 +8,2 @@ -}
\ 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 @@ -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 + |