Fix commit queue to actually abort on import error.

projects.py

Index: projects.py
diff --git a/projects.py b/projects.py
index f27eb734edc61af77686a6582b9546ca82f45ceb..488254e0fb9c655fc52a967281d4dab1ec09cc40 100644
--- a/projects.py
+++ b/projects.py
@@ -28,17 +28,19 @@ from verification import try_server
 
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))

[Paweł Hajdan Jr., 2013/10/10 23:04:33]

While you're here, shouldn't ROOT_DIR be more like MY_DIR or CQ_ROOT_DIR?

[agable, 2013/10/10 23:21:05]

It is the root of the repository...

-sys.path.insert(0, os.path.join(ROOT_DIR, '..', 'commit-queue-internal'))
+INTERNAL_DIR = os.path.abspath(
+    os.path.join(ROOT_DIR, os.pardir, 'commit-queue-internal'))
 
 # These come from commit-queue in the internal repo.
-try:
+if os.path.isdir(INTERNAL_DIR):
+  sys.path.insert(0, INTERNAL_DIR)
   import chromium_committers  # pylint: disable=F0401
   import gyp_committers  # pylint: disable=F0401
   import nacl_committers  # pylint: disable=F0401
   import skia_committers  # pylint: disable=F0401
-except ImportError as e:
+else:
   print >> sys.stderr, (
-      'Failed to find commit-queue-internal, will fail to start: %s' % e)
+      'Failed to find commit-queue-internal; will fail to start!')

[Paweł Hajdan Jr., 2013/10/10 23:04:33]

I don't think this patch makes it actually fail to start.

[agable, 2013/10/10 23:21:05]

Nope, but it didn't before either. CQ has never crashed when -internal isn't
preset, so it can be tested by external devs. Now at least it crashes when the
imports from -internal fail.

   chromium_committers = None
   gyp_committers = None
   nacl_committers = None