[jhbuild] Correct arch.py error handling



commit 88a76fdd77329d4fa835f2b809e91335ae849d14
Author: Craig Keogh <cskeogh adam com au>
Date:   Thu Aug 11 22:33:45 2011 +0930

    Correct arch.py error handling

 jhbuild/versioncontrol/arch.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/jhbuild/versioncontrol/arch.py b/jhbuild/versioncontrol/arch.py
index 7a2b411..14978d4 100644
--- a/jhbuild/versioncontrol/arch.py
+++ b/jhbuild/versioncontrol/arch.py
@@ -22,7 +22,7 @@ __all__ = []
 
 import os, sys
 
-from jhbuild.errors import FatalError, BuildStateError, CommandError
+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
@@ -37,8 +37,7 @@ def register(archive, uri):
         assert uri is not None, 'can not register archive without uri'
         res = os.system('baz register-archive %s' % uri)
         if res != 0:
-            raise jhbuild.errors.FatalError(_('could not register archive %s')
-                                            % archive)
+            raise FatalError(_('could not register archive %s') % archive)
 
 def get_version(directory):
     '''Gets the tree version for a particular directory.'''
@@ -125,7 +124,7 @@ class ArchBranch(Branch):
             cmd.append(checkoutdir)
 
         if date:
-            raise BuildStageError(_('date based checkout not yet supported\n'))
+            raise FatalError(_('date based checkout not yet supported'))
 
         buildscript.execute(cmd, 'arch', cwd=self.checkoutroot)
 
@@ -138,7 +137,7 @@ class ArchBranch(Branch):
             self.repository._ensure_registered()
 
         if date:
-            raise BuildStageError(_('date based checkout not yet supported\n'))
+            raise FatalError(_('date based checkout not yet supported'))
 
         archive, version = split_name(self.module)
         # how do you move a working copy to another branch?



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]