Merge lp:~gesha/linaro-license-protection/configs-add-readme-textile-to-staging into lp:linaro-license-protection/configs

Proposed by Georgy Redkozubov
Status: Merged
Merged at revision: 26
Proposed branch: lp:~gesha/linaro-license-protection/configs-add-readme-textile-to-staging
Merge into: lp:linaro-license-protection/configs
Diff against target: 60 lines (+27/-8)
2 files modified
django/settings_releases.py (+8/-8)
django/settings_staging_releases.py (+19/-0)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/configs-add-readme-textile-to-staging
Reviewer Review Type Date Requested Status
Fathi Boudra Approve
Review via email: mp+131042@code.launchpad.net

Description of the change

This branch adds README.textile support for staging.releases.linaro.org

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

all LINUX_FILES should have the .textile extension.

review: Needs Fixing
27. By Georgy Redkozubov

Update LINUX_FILES according to spec

Revision history for this message
Fathi Boudra (fboudra) wrote :

ship it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django/settings_releases.py'
2--- django/settings_releases.py 2012-10-23 13:05:10 +0000
3+++ django/settings_releases.py 2012-10-23 16:18:21 +0000
4@@ -25,10 +25,10 @@
5
6 # Render TEXTILE files settings.
7 LINUX_FILES = ('README.textile',
8- 'INSTALL',
9- 'HACKING',
10- 'FIRMWARE',
11- 'RTSM')
12+ 'INSTALL.textile',
13+ 'HACKING.textile',
14+ 'FIRMWARE.textile',
15+ 'RTSM.textile')
16 ANDROID_FILES = ('HOWTO_releasenotes.txt',
17 'HOWTO_install.txt',
18 'HOWTO_getsourceandbuild.txt',
19@@ -44,10 +44,10 @@
20 'HOWTO_flashfirmware.txt': 'Firmware Update',
21 'HOWTO_rtsm.txt': 'RTSM',
22 'README.textile': 'Release Notes',
23- 'INSTALL': 'Binary Image Installation',
24- 'HACKING': 'Building From Source',
25- 'FIRMWARE': 'Firmware Update',
26- 'RTSM': 'RTSM'}
27+ 'INSTALL.textile': 'Binary Image Installation',
28+ 'HACKING.textile': 'Building From Source',
29+ 'FIRMWARE.textile': 'Firmware Update',
30+ 'RTSM.textile': 'RTSM'}
31
32 TAB_PRIORITY = ['Release Notes',
33 'Binary Image Installation',
34
35=== modified file 'django/settings_staging_releases.py'
36--- django/settings_staging_releases.py 2012-08-16 09:56:08 +0000
37+++ django/settings_staging_releases.py 2012-10-23 16:18:21 +0000
38@@ -18,3 +18,22 @@
39 os.path.join(PROJECT_ROOT, "templates" ),
40 )
41 SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']
42+
43+# Render TEXTILE files settings.
44+LINUX_FILES = ('README.textile',
45+ 'INSTALL.textile',
46+ 'HACKING.textile',
47+ 'FIRMWARE.textile',
48+ 'RTSM.textile')
49+
50+FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
51+ 'HOWTO_install.txt': 'Binary Image Installation',
52+ 'HOWTO_getsourceandbuild.txt': 'Building From Source',
53+ 'HOWTO_flashfirmware.txt': 'Firmware Update',
54+ 'HOWTO_rtsm.txt': 'RTSM',
55+ 'README.textile': 'Release Notes',
56+ 'INSTALL.textile': 'Binary Image Installation',
57+ 'HACKING.textile': 'Building From Source',
58+ 'FIRMWARE.textile': 'Firmware Update',
59+ 'RTSM.textile': 'RTSM'}
60+

Subscribers

People subscribed via source and target branches