Merge remote branch 'cros/upstream' into tempbranch

frontend/afe/rpc_utils.py

 """\
 Utility functions for rpc_interface.py.  We keep them in a separate file so that
 only RPC interface functions go into that file.
 """
 
 __author__ = 'showard@google.com (Steve Howard)'
 
 import datetime, os, sys, inspect
 import django.http
 from autotest_lib.frontend.afe import models, model_logic, model_attributes
@@ skipping 215 matching lines @@
     # check that hosts satisfy dependencies
     host_ids = [host.id for host in host_objects]
     hosts_in_job = models.Host.objects.filter(id__in=host_ids)
     ok_hosts = hosts_in_job
     for index, dependency in enumerate(job_dependencies):
         ok_hosts = ok_hosts.filter(labels__name=dependency)
     failing_hosts = (set(host.hostname for host in host_objects) -
                      set(host.hostname for host in ok_hosts))
     if failing_hosts:
         raise model_logic.ValidationError(
-            {'hosts' : 'Host(s) failed to meet job dependencies: ' +
-                       ', '.join(failing_hosts)})
+            {'hosts' : 'Host(s) failed to meet job dependencies (' +
+                       (', '.join(job_dependencies)) + '): ' +
+                       (', '.join(failing_hosts))})
+
 
 
 def _execution_key_for(host_queue_entry):
     return (host_queue_entry.job.id, host_queue_entry.execution_subdir)
 
 
 def check_abort_synchronous_jobs(host_queue_entries):
     # ensure user isn't aborting part of a synchronous autoserv execution
     count_per_execution = {}
     for queue_entry in host_queue_entries:
@@ skipping 494 matching lines @@
                    reboot_after=reboot_after,
                    parse_failed_repair=parse_failed_repair,
                    keyvals=keyvals,
                    drone_set=drone_set,
                    parameterized_job=parameterized_job)
     return create_new_job(owner=owner,
                           options=options,
                           host_objects=host_objects,
                           metahost_objects=metahost_objects,
                           atomic_group=atomic_group)