Merge branch 'master' of github.com:clipperz/password-manager

Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css

1 files changed, 10 insertions, 1 deletions

diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index a47e249..7ac2324 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -8,18 +8,20 @@ def repositoryWithPath (path):
 
                 repo = hg.repository(ui.ui(), path)
                 result = HgRepository(repo, path)
         except:
                 try:
                         from git import Repo
-
                         repo = Repo(path)
                         result = GitRepository(repo, path)
+
                 except ImportError, exception:
                         print "Failed to import git, please install http://gitorious.org/git-python"
                         raise exception
+                except:
+                        result = SnapshotRepository('', path)
 
 
         return result
 
 
 #===================================================================
@@ -83,6 +85,13 @@ class HgRepository(Repository):
         def areTherePendingChanges (self):
                 # TODO: FIXME: repository.status() does not report 'unknown(?)' files. :(
                 return not all(map(lambda fileList: len(fileList) == 0, self.repository.status()))
 
 
 #===================================================================
+
+class SnapshotRepository(Repository):
+        def revision (self):
+                return 'SNAPSHOT'
+
+        def areTherePendingChanges (self):
+                return False