Merge pull request #47 from jokajak/gitCheck

add friendly error message when the git python module can't be found

1 files changed, 2 insertions, 1 deletions

diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 7a44e47..2d4a12b 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -1,99 +1,100 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 
 def repositoryWithPath (path):
         try:
                 from mercurial import ui, hg
 
                 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
+                        print "Use sudo apt-get install python-git for Ubuntu/Debian"
+                        print "Use sudo yum install GitPython for Fedora/RHEL/CentOS"
                 except:
                         result = SnapshotRepository('', path)
 
 
         return result
 
 
 #===================================================================
 
 
 class Repository(object):
 
         def __init__ (self, repository, path):
                 self.repository = repository
                 self.path = path
 
 
         def revision (self):
                 raise NotImplementedError()
         
 
         def areTherePendingChanges (self):
                 raise NotImplementedError()
 
 
         def version (self):
                 result = self.revision()
                 if self.areTherePendingChanges():
                         result = '>>> ' + result + ' <<<'
 
                 # print "VERSION: " + result
                 return result
 
 
 #===================================================================
 
 
 class GitRepository(Repository):
                 #http://gitorious.org/git-python
 
         def revision (self):
                 try:
                         return self.repository.head.commit.hexsha
                 except:
                         return self.repository.commits()[0].id
 
 
         def areTherePendingChanges (self):
                 try:
                         return self.repository.is_dirty()
                 except TypeError, te:
                         return self.repository.is_dirty
 
 
 
 #===================================================================
 
 
 class HgRepository(Repository):
                 #http://mercurial.selenic.com/wiki/MercurialApi
 
         def revision (self):
                 return 'hg:' + str(self.repository['tip'])
         
 
         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