Fix commit queue to actually abort on import error.

projects.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Define the supported projects."""
 
 import json
 import logging
 import os
 import re
 import sys
 import urllib2
 
 import find_depot_tools  # pylint: disable=W0611
 import checkout
 
 import async_push
 import context
 import errors
 import pending_manager
 from post_processors import chromium_copyright
 from verification import presubmit_check
 from verification import project_base
 from verification import reviewer_lgtm
 from verification import tree_status
 from verification import try_job_steps
 from verification import try_job_on_rietveld
 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
   skia_committers = None
 
 
 # It's tricky here because 'chrome' is remapped to 'svn' on src.chromium.org but
 # the other repositories keep their repository name. So don't list it here.
 SVN_HOST_ALIASES = [
     'svn://svn.chromium.org',
@@ skipping 682 matching lines @@
   """List the projects that can be managed by the commit queue."""
   return sorted(
       x[5:] for x in dir(sys.modules[__name__]) if x.startswith('_gen_'))
 
 
 def load_project(project, user, root_dir, rietveld_obj, no_try):
   """Loads the specified project."""
   assert os.path.isabs(root_dir)
   return getattr(sys.modules[__name__], '_gen_' + project)(
       user, root_dir, rietveld_obj, no_try)