Merge lp:~dooferlad/linaro-android-frontend/proxy_MANIFEST into lp:linaro-android-frontend

Proposed by James Tunnicliffe
Status: Merged
Approved by: Paul Sokolovsky
Approved revision: 247
Merged at revision: 247
Proposed branch: lp:~dooferlad/linaro-android-frontend/proxy_MANIFEST
Merge into: lp:linaro-android-frontend
Diff against target: 12 lines (+1/-1)
1 file modified
android_build/frontend/api.py (+1/-1)
To merge this branch: bzr merge lp:~dooferlad/linaro-android-frontend/proxy_MANIFEST
Reviewer Review Type Date Requested Status
Linaro Infrastructure Pending
Review via email: mp+91113@code.launchpad.net

Description of the change

Fixes up the proxy API to proxy MANIFEST, not manifest.txt.

This should be deployed after manifest generation has been fixed and old, broken manifest files are removed from snapshots.linaro.org.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'android_build/frontend/api.py'
--- android_build/frontend/api.py 2012-01-24 14:18:27 +0000
+++ android_build/frontend/api.py 2012-02-01 15:52:18 +0000
@@ -284,7 +284,7 @@
284 allowed_hosts = ["https?://snapshots.linaro.org/",284 allowed_hosts = ["https?://snapshots.linaro.org/",
285 "https?://android-build.linaro.org"]285 "https?://android-build.linaro.org"]
286286
287 allowed_files = ['lava-job-info', 'manifest.txt']287 allowed_files = ['lava-job-info', 'MANIFEST']
288288
289 if not (_match_host(allowed_hosts, url) and289 if not (_match_host(allowed_hosts, url) and
290 _match_file(allowed_files, url)):290 _match_file(allowed_files, url)):

Subscribers

People subscribed via source and target branches