author | Clipperz <info@clipperz.com> | 2013-01-09 11:45:31 (UTC) |
---|---|---|
committer | Clipperz <info@clipperz.com> | 2013-01-09 11:45:31 (UTC) |
commit | 9741a93a9f5c76827135b43c03b20c0a48f12604 (patch) (unidiff) | |
tree | 1a8fff379a033d873c9e1c7faff755fb6bb7b118 /scripts/builder | |
parent | 8ef30d00eb96004c39540019336c0ec99dae01cb (diff) | |
download | clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.zip clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.gz clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.bz2 |
Merge latest changes with public repository
-rw-r--r-- | scripts/builder/repository.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index 7ac2324..7a44e47 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py | |||
@@ -12,9 +12,8 @@ def repositoryWithPath (path): | |||
12 | try: | 12 | try: |
13 | from git import Repo | 13 | from git import Repo |
14 | repo = Repo(path) | 14 | repo = Repo(path) |
15 | result = GitRepository(repo, path) | 15 | result = GitRepository(repo, path) |
16 | |||
17 | except ImportError, exception: | 16 | except ImportError, exception: |
18 | print "Failed to import git, please install http://gitorious.org/git-python" | 17 | print "Failed to import git, please install http://gitorious.org/git-python" |
19 | raise exception | 18 | raise exception |
20 | except: | 19 | except: |
@@ -88,10 +87,13 @@ class HgRepository(Repository): | |||
88 | 87 | ||
89 | 88 | ||
90 | #=================================================================== | 89 | #=================================================================== |
91 | 90 | ||
91 | |||
92 | class SnapshotRepository(Repository): | 92 | class SnapshotRepository(Repository): |
93 | |||
93 | def revision (self): | 94 | def revision (self): |
94 | return 'SNAPSHOT' | 95 | return 'SNAPSHOT' |
95 | 96 | ||
97 | |||
96 | def areTherePendingChanges (self): | 98 | def areTherePendingChanges (self): |
97 | return False | 99 | return False |