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

[James Tunnicliffe]

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

[Georgy Redkozubov (gesha)]

Looks good

review: Approve

=== modified file '.htaccess'
--- .htaccess	2012-05-30 02:38:21 +0000
+++ .htaccess	2012-06-20 11:37:19 +0000
@@ -30,9 +30,6 @@
 
 ## If license file is requested, and a download has been requested previously,
 ## pass through to the license file.
-RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR]
-RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR]
-RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR]
 RewriteCond %{REQUEST_URI} /licenses/nolicense.html$ [OR]
 RewriteCond %{REQUEST_URI} /licenses/license.php$
 RewriteCond %{HTTP_COOKIE} downloadrequested
@@ -41,9 +38,6 @@
 
 ## When license files are requested directly, forward to
 ## the snapshots.l.o site itself.
-RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR]
-RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR]
-RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR]
 RewriteCond %{REQUEST_URI} /licenses/license.php$
 RewriteCond %{HTTP_COOKIE} !downloadrequested=(.*)
 RewriteRule .* / [R,L]
 
=== modified file 'tests/test_click_through_license.py'
--- tests/test_click_through_license.py	2012-06-18 12:45:39 +0000
+++ tests/test_click_through_license.py	2012-06-20 11:37:19 +0000
@@ -19,9 +19,9 @@
 
 host = 'http://127.0.0.1'
 port = '0'  # 0 == Pick a free port.
-samsung_license_path = '/licenses/samsung.html'
-ste_license_path = '/licenses/ste.html'
-linaro_license_path = '/licenses/linaro.html'
+samsung_license_path = '/licenses/license.php'
+ste_license_path = '/licenses/license.php'
+linaro_license_path = '/licenses/license.php'
 samsung_test_file = '/android/~linaro-android/staging-origen/test.txt'
 ste_test_file = ('/android/~linaro-android/staging-snowball'
                  '/173/target/product/snowball/test.txt')