jhbuild r1855 - in trunk: . jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Sat Jan 19 16:37:52 2008
New Revision: 1855
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1855&view=rev

Log:
* jhbuild/versioncontrol/darcs.py: check for darcs command before
trying to use it, to provide informative error message.
(closes: #510633)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/darcs.py

Modified: trunk/jhbuild/versioncontrol/darcs.py
==============================================================================
--- trunk/jhbuild/versioncontrol/darcs.py	(original)
+++ trunk/jhbuild/versioncontrol/darcs.py	Sat Jan 19 16:37:52 2008
@@ -24,8 +24,9 @@
 import os
 import urlparse
 
-from jhbuild.errors import FatalError
+from jhbuild.errors import FatalError, CommandError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
+from jhbuild.commands.sanitycheck import inpath
 
 class DarcsRepository(Repository):
     """A class representing a Darcs repository.
@@ -97,6 +98,9 @@
             os.chmod(path, stat.st_mode | 0111)
 
     def checkout(self, buildscript):
+        if not inpath('darcs', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError('Missing darcs command')
+
         if os.path.exists(self.srcdir):
             self._update(buildscript)
         else: