jhbuild r2419 - in trunk: . jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Sun Oct 12 21:19:20 2008
New Revision: 2419
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2419&view=rev

Log:
* jhbuild/versioncontrol/arch.py, jhbuild/versioncontrol/bzr.py,
jhbuild/versioncontrol/cvs.py, jhbuild/versioncontrol/darcs.py,
jhbuild/versioncontrol/git.py, jhbuild/versioncontrol/hg.py,
jhbuild/versioncontrol/mtn.py, jhbuild/versioncontrol/svn.py: check the
programs exist before the checkout (closes: #555690)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/arch.py
   trunk/jhbuild/versioncontrol/bzr.py
   trunk/jhbuild/versioncontrol/cvs.py
   trunk/jhbuild/versioncontrol/darcs.py
   trunk/jhbuild/versioncontrol/git.py
   trunk/jhbuild/versioncontrol/hg.py
   trunk/jhbuild/versioncontrol/mtn.py
   trunk/jhbuild/versioncontrol/svn.py

Modified: trunk/jhbuild/versioncontrol/arch.py
==============================================================================
--- trunk/jhbuild/versioncontrol/arch.py	(original)
+++ trunk/jhbuild/versioncontrol/arch.py	Sun Oct 12 21:19:20 2008
@@ -25,6 +25,7 @@
 from jhbuild.errors import FatalError, BuildStateError
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
+from jhbuild.commands.sanitycheck import inpath
 
 def is_registered(archive):
     location = os.path.join(os.environ['HOME'], '.arch-params',
@@ -150,6 +151,8 @@
         buildscript.execute(cmd, 'arch', cwd=self.srcdir)
 
     def checkout(self, buildscript):
+        if not inpath('arch', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError(_('%s not found') % 'arch')
         if os.path.exists(self.srcdir):
             self._update(buildscript)
         else:

Modified: trunk/jhbuild/versioncontrol/bzr.py
==============================================================================
--- trunk/jhbuild/versioncontrol/bzr.py	(original)
+++ trunk/jhbuild/versioncontrol/bzr.py	Sun Oct 12 21:19:20 2008
@@ -27,6 +27,7 @@
 from jhbuild.errors import FatalError
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
+from jhbuild.commands.sanitycheck import inpath
 
 # Make sure that the urlparse module considers sftp://
 # scheme to be netloc aware and set to allow relative URIs.
@@ -105,6 +106,8 @@
         buildscript.execute(cmd, 'bzr', cwd=self.srcdir)
 
     def checkout(self, buildscript):
+        if not inpath('bzr', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError(_('%s not found') % 'bzr')
         if os.path.exists(self.srcdir):
             self._update(buildscript)
         else:

Modified: trunk/jhbuild/versioncontrol/cvs.py
==============================================================================
--- trunk/jhbuild/versioncontrol/cvs.py	(original)
+++ trunk/jhbuild/versioncontrol/cvs.py	Sun Oct 12 21:19:20 2008
@@ -32,6 +32,7 @@
 
 from jhbuild.errors import BuildStateError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
+from jhbuild.commands.sanitycheck import inpath
 
 
 # table used to scramble passwords in ~/.cvspass files
@@ -285,6 +286,8 @@
         buildscript.execute(cmd, 'cvs', cwd=outputdir)
 
     def checkout(self, buildscript):
+        if not inpath('cvs', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError(_('%s not found') % 'cvs')
         if self.checkout_mode in ('clobber', 'export'):
             self._wipedir(buildscript)
             if self.checkout_mode == 'clobber':

Modified: trunk/jhbuild/versioncontrol/darcs.py
==============================================================================
--- trunk/jhbuild/versioncontrol/darcs.py	(original)
+++ trunk/jhbuild/versioncontrol/darcs.py	Sun Oct 12 21:19:20 2008
@@ -101,7 +101,7 @@
 
     def checkout(self, buildscript):
         if not inpath('darcs', os.environ['PATH'].split(os.pathsep)):
-            raise CommandError(_('Missing darcs command'))
+            raise CommandError(_('%s not found') % 'darcs')
 
         if os.path.exists(self.srcdir):
             self._update(buildscript)

Modified: trunk/jhbuild/versioncontrol/git.py
==============================================================================
--- trunk/jhbuild/versioncontrol/git.py	(original)
+++ trunk/jhbuild/versioncontrol/git.py	Sun Oct 12 21:19:20 2008
@@ -32,6 +32,7 @@
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
 import jhbuild.versioncontrol.svn
+from jhbuild.commands.sanitycheck import inpath
 
 # Make sure that the urlparse module considers git:// and git+ssh://
 # schemes to be netloc aware and set to allow relative URIs.
@@ -212,6 +213,8 @@
 
 
     def checkout(self, buildscript):
+        if not inpath('git', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError(_('%s not found') % 'git')
         if self.checkout_mode in ('clobber', 'export'):
             self._wipedir(buildscript)
             self._checkout(buildscript)

Modified: trunk/jhbuild/versioncontrol/hg.py
==============================================================================
--- trunk/jhbuild/versioncontrol/hg.py	(original)
+++ trunk/jhbuild/versioncontrol/hg.py	Sun Oct 12 21:19:20 2008
@@ -28,6 +28,7 @@
 
 from jhbuild.errors import FatalError, CommandError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
+from jhbuild.commands.sanitycheck import inpath
 
 class HgRepository(Repository):
     """A class representing a Mercurial repository.
@@ -95,6 +96,8 @@
         buildscript.execute([hg_update_path], hg_update, cwd=self.srcdir)
 
     def checkout(self, buildscript):
+        if not inpath('hg', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError(_('%s not found') % 'hg')
         if os.path.exists(self.srcdir):
             self._update(buildscript)
         else:

Modified: trunk/jhbuild/versioncontrol/mtn.py
==============================================================================
--- trunk/jhbuild/versioncontrol/mtn.py	(original)
+++ trunk/jhbuild/versioncontrol/mtn.py	Sun Oct 12 21:19:20 2008
@@ -26,6 +26,7 @@
 from jhbuild.errors import CommandError
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
+from jhbuild.commands.sanitycheck import inpath
 
 class MonotoneRepository(Repository):
     """A class representing a Monotone database."""
@@ -134,6 +135,9 @@
         buildscript.execute(cmd, 'mtn', cwd=self._codir)
 
     def checkout(self, buildscript):
+        if not inpath('mtn', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError(_('%s not found') % 'mtn')
+
         if not os.path.exists(self.repository.database):
             self._init(buildscript)
 

Modified: trunk/jhbuild/versioncontrol/svn.py
==============================================================================
--- trunk/jhbuild/versioncontrol/svn.py	(original)
+++ trunk/jhbuild/versioncontrol/svn.py	Sun Oct 12 21:19:20 2008
@@ -27,6 +27,7 @@
 from jhbuild.errors import CommandError, BuildStateError
 from jhbuild.utils.cmds import get_output, check_version
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
+from jhbuild.commands.sanitycheck import inpath
 
 import bzr, git
 
@@ -281,6 +282,8 @@
             raise CommandError(_('Error checking for conflicts'))
 
     def checkout(self, buildscript):
+        if not inpath('svn', os.environ['PATH'].split(os.pathsep)):
+            raise CommandError(_('%s not found') % 'svn')
         if self.checkout_mode in ('clobber', 'export'):
             self._wipedir(buildscript)
             if self.checkout_mode == 'clobber':