Merge lp:~dooferlad/linaro-android-frontend/proxy_lava-job-info_updates into lp:linaro-android-frontend

[James Tunnicliffe]

Fixes problems seen on deployment of last branch.

[Paul Sokolovsky (pfalcon)]

Looks good.

review: Approve

[Paul Sokolovsky (pfalcon)]

Merged, but not deployed, let's do it tomorrow.

=== modified file 'android_build/frontend/api.py'
--- android_build/frontend/api.py	2012-01-09 18:27:49 +0000
+++ android_build/frontend/api.py	2012-01-10 18:13:25 +0000
@@ -276,10 +276,14 @@
     try:
         response = urllib2.urlopen(url)
     except urllib2.HTTPError, e:
-        message = "Server error: {}".format(e.code)
+        message = "Server error: %d" % e.code
         return HttpResponse(message)
     except urllib2.URLError, e:
-        message = "We failed to reach a server. Reason{}".format(e.reason)
+        message = "We failed to reach a server."
+
+        if isinstance(e.reason, str):
+            message += " Reason %s" % e.reason
+
         return HttpResponse(message)
     else:
         return HttpResponse(response.read())

=== modified file 'static/buildDetails.js'
--- static/buildDetails.js	2012-01-10 13:34:52 +0000
+++ static/buildDetails.js	2012-01-10 18:13:25 +0000
@@ -102,8 +102,10 @@
 
         if (typeof receivedLavaJobInfo.got_info != "undefined")
         {
-//            alert("Two resutls files found. Please report this error by submitting a bug report against" +
-//                  " https://code.launchpad.net/~linaro-infrastructure/linaro-android-frontend/trunk")
+            // Don't pass through a second job info. Assumption is that they are the same
+            // so it doesn't matter if we find several and they are just duplicates. This
+            // happened around 12-2011 when we started to migrate build outputs to
+            // snapshots.linaro.org.
             return;
         }