author | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-19 01:35:36 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-19 01:35:36 (UTC) |
commit | 36ff1deefcbbd24aceca97eb39a13f9da4af8ff5 (patch) (unidiff) | |
tree | 811b944f321218fdb3d9d02df13da2ea2eef4949 /scripts | |
parent | 758bd68eee9c0ae1d3ad8dc50481c78557bd6228 (diff) | |
parent | 67ba4cd7b5bc5e834db3106b3081677ee70d18f7 (diff) | |
download | clipperz-36ff1deefcbbd24aceca97eb39a13f9da4af8ff5.zip clipperz-36ff1deefcbbd24aceca97eb39a13f9da4af8ff5.tar.gz clipperz-36ff1deefcbbd24aceca97eb39a13f9da4af8ff5.tar.bz2 |
Merge pull request #36 from jokajak/buildFix
add code to handle older version of GitPython
-rw-r--r-- | scripts/builder/repository.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index 0045de7..a47e249 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py | |||
@@ -51,21 +51,28 @@ class Repository(object): | |||
51 | 51 | ||
52 | #=================================================================== | 52 | #=================================================================== |
53 | 53 | ||
54 | 54 | ||
55 | class GitRepository(Repository): | 55 | class GitRepository(Repository): |
56 | #http://gitorious.org/git-python | 56 | #http://gitorious.org/git-python |
57 | 57 | ||
58 | def revision (self): | 58 | def revision (self): |
59 | return self.repository.head.commit.hexsha | 59 | try: |
60 | return self.repository.head.commit.hexsha | ||
61 | except: | ||
62 | return self.repository.commits()[0].id | ||
60 | 63 | ||
61 | 64 | ||
62 | def areTherePendingChanges (self): | 65 | def areTherePendingChanges (self): |
63 | return self.repository.is_dirty() | 66 | try: |
67 | return self.repository.is_dirty() | ||
68 | except TypeError, te: | ||
69 | return self.repository.is_dirty | ||
70 | |||
64 | 71 | ||
65 | 72 | ||
66 | #=================================================================== | 73 | #=================================================================== |
67 | 74 | ||
68 | 75 | ||
69 | class HgRepository(Repository): | 76 | class HgRepository(Repository): |
70 | #http://mercurial.selenic.com/wiki/MercurialApi | 77 | #http://mercurial.selenic.com/wiki/MercurialApi |
71 | 78 | ||