linaro-license-protection

Merge lp:~stevanr/linaro-license-protection/bug-1069814-configs into lp:linaro-license-protection/configs

  1. bug-1069814-configs
  2. Merge into configs
Proposed by Stevan Radaković
Status: Merged
Approved by: Georgy Redkozubov
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~stevanr/linaro-license-protection/bug-1069814-configs
Merge into: lp:linaro-license-protection/configs
Diff against target: 81 lines (+66/-0)
2 files modified
django/settings_releases.py (+33/-0)
django/settings_snapshots.py (+33/-0)
To merge this branch: bzr merge lp:~stevanr/linaro-license-protection/bug-1069814-configs
Reviewer Review Type Date Requested Status
Georgy Redkozubov Approve
Linaro Infrastructure Pending
Review via email: mp+130884@code.launchpad.net

Description of the change

Update textile README file extension for releases.

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

Looks good, one comment, I guess we should add the same to settings_staging_releases.py

review: Approve
lp:~stevanr/linaro-license-protection/bug-1069814-configs updated
25. By Stevan Radaković

Apply changes from code review fixes.

Revision history for this message
Georgy Redkozubov (gesha) wrote :

Please update configs for staging server otherwise we'll get errors running app on staging instances.

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-08-23 16:40:00 +0000
3+++ django/settings_releases.py 2012-10-23 09:40:26 +0000
4@@ -22,3 +22,36 @@
5 os.path.join(PROJECT_ROOT, "templates" ),
6 )
7 SERVED_PATHS = ['/srv/releases.linaro.org/www']
8+
9+# Render TEXTILE files settings.
10+LINUX_FILES = ('README.textile',
11+ 'INSTALL',
12+ 'HACKING',
13+ 'FIRMWARE',
14+ 'RTSM')
15+ANDROID_FILES = ('HOWTO_releasenotes.txt',
16+ 'HOWTO_install.txt',
17+ 'HOWTO_getsourceandbuild.txt',
18+ 'HOWTO_flashfirmware.txt',
19+ 'HOWTO_rtsm.txt')
20+
21+MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',
22+ 'HOWTO_getsourceandbuild.txt',
23+ 'HOWTO_flashfirmware.txt')
24+
25+FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
26+ 'HOWTO_install.txt': 'Binary Image Installation',
27+ 'HOWTO_getsourceandbuild.txt': 'Building From Source',
28+ 'HOWTO_flashfirmware.txt': 'Firmware Update',
29+ 'HOWTO_rtsm.txt': 'RTSM',
30+ 'README.textile': 'Release Notes',
31+ 'INSTALL': 'Binary Image Installation',
32+ 'HACKING': 'Building From Source',
33+ 'FIRMWARE': 'Firmware Update',
34+ 'RTSM': 'RTSM'}
35+
36+TAB_PRIORITY = ['Release Notes',
37+ 'Binary Image Installation',
38+ 'Building From Source',
39+ 'Firmware Update',
40+ 'RTSM']
41
42=== modified file 'django/settings_snapshots.py'
43--- django/settings_snapshots.py 2012-08-23 16:40:00 +0000
44+++ django/settings_snapshots.py 2012-10-23 09:40:26 +0000
45@@ -22,3 +22,36 @@
46 os.path.join(PROJECT_ROOT, "templates" ),
47 )
48 SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
49+
50+# Render TEXTILE files settings.
51+LINUX_FILES = ('README',
52+ 'INSTALL',
53+ 'HACKING',
54+ 'FIRMWARE',
55+ 'RTSM')
56+ANDROID_FILES = ('HOWTO_releasenotes.txt',
57+ 'HOWTO_install.txt',
58+ 'HOWTO_getsourceandbuild.txt',
59+ 'HOWTO_flashfirmware.txt',
60+ 'HOWTO_rtsm.txt')
61+
62+MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',
63+ 'HOWTO_getsourceandbuild.txt',
64+ 'HOWTO_flashfirmware.txt')
65+
66+FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
67+ 'HOWTO_install.txt': 'Binary Image Installation',
68+ 'HOWTO_getsourceandbuild.txt': 'Building From Source',
69+ 'HOWTO_flashfirmware.txt': 'Firmware Update',
70+ 'HOWTO_rtsm.txt': 'RTSM',
71+ 'README': 'Release Notes',
72+ 'INSTALL': 'Binary Image Installation',
73+ 'HACKING': 'Building From Source',
74+ 'FIRMWARE': 'Firmware Update',
75+ 'RTSM': 'RTSM'}
76+
77+TAB_PRIORITY = ['Release Notes',
78+ 'Binary Image Installation',
79+ 'Building From Source',
80+ 'Firmware Update',
81+ 'RTSM']

Subscribers

People subscribed via source and target branches