linaro-license-protection

Merge lp:~dooferlad/linaro-license-protection/remove-direct-license-references into lp:~linaro-automation/linaro-license-protection/trunk

  1. remove-direct-license-references
  2. Merge into trunk
Proposed by James Tunnicliffe
Status: Merged
Approved by: James Tunnicliffe
Approved revision: 81
Merge reported by: James Tunnicliffe
Merged at revision: not available
Proposed branch: lp:~dooferlad/linaro-license-protection/remove-direct-license-references
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 40 lines (+3/-9)
2 files modified
.htaccess (+0/-6)
tests/test_click_through_license.py (+3/-3)
To merge this branch: bzr merge lp:~dooferlad/linaro-license-protection/remove-direct-license-references
Reviewer Review Type Date Requested Status
Georgy Redkozubov Approve
Review via email: mp+111195@code.launchpad.net

Description of the change

Stop directly fetching license html files - always use license.php

To post a comment you must log in.
Revision history for this message
Georgy Redkozubov (gesha) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.htaccess'
2--- .htaccess 2012-05-30 02:38:21 +0000
3+++ .htaccess 2012-06-20 11:37:19 +0000
4@@ -30,9 +30,6 @@
5
6 ## If license file is requested, and a download has been requested previously,
7 ## pass through to the license file.
8-RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR]
9-RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR]
10-RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR]
11 RewriteCond %{REQUEST_URI} /licenses/nolicense.html$ [OR]
12 RewriteCond %{REQUEST_URI} /licenses/license.php$
13 RewriteCond %{HTTP_COOKIE} downloadrequested
14@@ -41,9 +38,6 @@
15
16 ## When license files are requested directly, forward to
17 ## the snapshots.l.o site itself.
18-RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR]
19-RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR]
20-RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR]
21 RewriteCond %{REQUEST_URI} /licenses/license.php$
22 RewriteCond %{HTTP_COOKIE} !downloadrequested=(.*)
23 RewriteRule .* / [R,L]
24
25=== modified file 'tests/test_click_through_license.py'
26--- tests/test_click_through_license.py 2012-06-18 12:45:39 +0000
27+++ tests/test_click_through_license.py 2012-06-20 11:37:19 +0000
28@@ -19,9 +19,9 @@
29
30 host = 'http://127.0.0.1'
31 port = '0' # 0 == Pick a free port.
32-samsung_license_path = '/licenses/samsung.html'
33-ste_license_path = '/licenses/ste.html'
34-linaro_license_path = '/licenses/linaro.html'
35+samsung_license_path = '/licenses/license.php'
36+ste_license_path = '/licenses/license.php'
37+linaro_license_path = '/licenses/license.php'
38 samsung_test_file = '/android/~linaro-android/staging-origen/test.txt'
39 ste_test_file = ('/android/~linaro-android/staging-snowball'
40 '/173/target/product/snowball/test.txt')

Subscribers

People subscribed via source and target branches