jhbuild r2634 - in trunk: . jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Fri Jan  9 10:17:29 2009
New Revision: 2634
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2634&view=rev

Log:
* jhbuild/versioncontrol/arch.py, jhbuild/versioncontrol/bzr.py,
jhbuild/versioncontrol/cvs.py: properly import CommandError exception
in arch, bzr and cvs modules.  (closes: #567107)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/arch.py
   trunk/jhbuild/versioncontrol/bzr.py
   trunk/jhbuild/versioncontrol/cvs.py

Modified: trunk/jhbuild/versioncontrol/arch.py
==============================================================================
--- trunk/jhbuild/versioncontrol/arch.py	(original)
+++ trunk/jhbuild/versioncontrol/arch.py	Fri Jan  9 10:17:29 2009
@@ -22,7 +22,7 @@
 
 import os, sys
 
-from jhbuild.errors import FatalError, BuildStateError
+from jhbuild.errors import FatalError, BuildStateError, CommandError
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
 from jhbuild.commands.sanitycheck import inpath

Modified: trunk/jhbuild/versioncontrol/bzr.py
==============================================================================
--- trunk/jhbuild/versioncontrol/bzr.py	(original)
+++ trunk/jhbuild/versioncontrol/bzr.py	Fri Jan  9 10:17:29 2009
@@ -24,7 +24,7 @@
 import errno
 import urlparse
 
-from jhbuild.errors import FatalError
+from jhbuild.errors import FatalError, CommandError
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
 from jhbuild.commands.sanitycheck import inpath

Modified: trunk/jhbuild/versioncontrol/cvs.py
==============================================================================
--- trunk/jhbuild/versioncontrol/cvs.py	(original)
+++ trunk/jhbuild/versioncontrol/cvs.py	Fri Jan  9 10:17:29 2009
@@ -33,7 +33,7 @@
 
 import git
 
-from jhbuild.errors import BuildStateError
+from jhbuild.errors import BuildStateError, CommandError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
 from jhbuild.commands.sanitycheck import inpath
 from jhbuild.utils.sxml import sxml