Upgrade from Django 0.96 to Django 1.0.2.
Risk: high (framework change)
Visibility: medium
Signed-off-by: James Ren <jamesren@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3457 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/afe/rpc_utils.py b/frontend/afe/rpc_utils.py
index c4003b1..548556b 100644
--- a/frontend/afe/rpc_utils.py
+++ b/frontend/afe/rpc_utils.py
@@ -7,7 +7,7 @@
import datetime, os
import django.http
-from frontend.afe import models, model_logic
+from autotest_lib.frontend.afe import models, model_logic
NULL_DATETIME = datetime.datetime.max
NULL_DATE = datetime.date.max
@@ -201,8 +201,7 @@
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 &= models.Host.objects.filter_custom_join(
- '_label%d' % index, labels__name=dependency)
+ 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: