Merge remote-tracking branch 'origin/master' into tagyourit

Conflicts:
	test/data/test.db

endpoints/api/build.py

@@ -11,6 +11,7 @@ from endpoints.common import start_build
 from endpoints.trigger import BuildTrigger
 from data import model
 from auth.permissions import ModifyRepositoryPermission
+from data.buildlogs import BuildStatusRetrievalError
 
 
 logger = logging.getLogger(__name__)
@@ -48,11 +49,17 @@ def trigger_view(trigger):
 
 
 def build_status_view(build_obj, can_write=False):
-  status = build_logs.get_status(build_obj.uuid)
+  phase = build_obj.phase
+  try:
+    status = build_logs.get_status(build_obj.uuid)
+  except BuildStatusRetrievalError:
+    status = {}
+    phase = 'cannot_load'
+
   logger.debug('Can write: %s job_config: %s', can_write, build_obj.job_config)
   resp = {
     'id': build_obj.uuid,
-    'phase': build_obj.phase if status else 'cannot_load',
+    'phase': phase,
     'started': format_date(build_obj.started),
     'display_name': build_obj.display_name,
     'status': status or {},
@@ -169,7 +176,10 @@ class RepositoryBuildLogs(RepositoryParamResource):
 
     start = int(request.args.get('start', 0))
 
-    count, logs = build_logs.get_log_entries(build.uuid, start)
+    try:
+      count, logs = build_logs.get_log_entries(build.uuid, start)
+    except BuildStatusRetrievalError:
+      count, logs = (0, [])
 
     response_obj.update({
       'start': start,

endpoints/api/trigger.py

@@ -13,7 +13,8 @@ from endpoints.api.build import (build_status_view, trigger_view, RepositoryBuil
                                  get_trigger_config)
 from endpoints.common import start_build
 from endpoints.trigger import (BuildTrigger as BuildTriggerBase, TriggerDeactivationException,
-                               TriggerActivationException, EmptyRepositoryException)
+                               TriggerActivationException, EmptyRepositoryException,
+                               RepositoryReadException)
 from data import model
 from auth.permissions import UserAdminPermission
 
@@ -116,9 +117,14 @@ class BuildTriggerSubdirs(RepositoryParamResource):
           'status': 'success'
         }
       except EmptyRepositoryException as exc:
+        return {
+          'status': 'success',
+          'subdir': []
+        }
+      except RepositoryReadException as exc:
         return {
           'status': 'error',
-          'message': exc.msg
+          'message': exc.message
         }
     else:
       raise Unauthorized()