# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1373557228 -7200
# Node ID fe4c1c1982e77d26d4218042ed089e9a36411de3
# Parent  bf0a575d8da806475026135719c4536a85de574b
[3.17 migration] when some cube is missing, add_cube raise ConfigurationError, not ImportError. Closes #2981477

diff -r bf0a575d8da8 -r fe4c1c1982e7 misc/migration/bootstrapmigration_repository.py
--- a/misc/migration/bootstrapmigration_repository.py	Thu Jul 11 10:20:42 2013 +0200
+++ b/misc/migration/bootstrapmigration_repository.py	Thu Jul 11 17:40:28 2013 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
@@ -20,6 +20,7 @@
 it should only include low level schema changes
 """
 
+from cubicweb import ConfigurationError
 from cubicweb.server.session import hooks_control
 from cubicweb.server import schemaserial as ss
 
@@ -37,19 +38,19 @@
 if applcubicwebversion < (3, 17, 0) and cubicwebversion >= (3, 17, 0):
     try:
         add_cube('sioc', update_database=False)
-    except ImportError:
+    except ConfigurationError:
         if not confirm('In cubicweb 3.17 sioc views have been moved to the sioc '
                        'cube, which is not installed.  Continue anyway?'):
             raise
     try:
         add_cube('embed', update_database=False)
-    except ImportError:
+    except ConfigurationError:
         if not confirm('In cubicweb 3.17 embedding views have been moved to the embed '
                        'cube, which is not installed.  Continue anyway?'):
             raise
     try:
         add_cube('geocoding', update_database=False)
-    except ImportError:
+    except ConfigurationError:
         if not confirm('In cubicweb 3.17 geocoding views have been moved to the geocoding '
                        'cube, which is not installed.  Continue anyway?'):
             raise
@@ -72,7 +73,7 @@
         from cubicweb import ExecutionError
         try:
             add_cube('localperms', update_database=False)
-        except ImportError:
+        except ConfigurationError:
             raise ExecutionError('In cubicweb 3.14, CWPermission and related stuff '
                                  'has been moved to cube localperms. Install it first.')