linaro-license-protection

Merge lp:~gesha/linaro-license-protection/configs-1246428 into lp:linaro-license-protection/configs

  1. configs-1246428
  2. Merge into configs
Proposed by Georgy Redkozubov
Status: Merged
Approved by: Milo Casagrande
Approved revision: 37
Merged at revision: 37
Proposed branch: lp:~gesha/linaro-license-protection/configs-1246428
Merge into: lp:linaro-license-protection/configs
Diff against target: 118 lines (+0/-95)
3 files modified
django/settings_releases.py (+0/-36)
django/settings_snapshots.py (+0/-36)
django/settings_staging_releases.py (+0/-23)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/configs-1246428
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Review via email: mp+193524@code.launchpad.net

Description of the change

This branch moves configuration of readme files to settings.py for easier maintaining in one place.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) 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 'django/settings_releases.py'
2--- django/settings_releases.py 2013-10-31 21:56:44 +0000
3+++ django/settings_releases.py 2013-11-01 00:24:03 +0000
4@@ -24,39 +24,3 @@
5
6 SERVED_PATHS = ['/srv/releases.linaro.org/www']
7 UPLOAD_PATH = '/srv/releases.linaro.org/uploads'
8-
9-# Render TEXTILE files settings.
10-LINUX_FILES = ('README.textile',
11- 'INSTALL.textile',
12- 'HACKING.textile',
13- 'FIRMWARE.textile',
14- 'FASTMODELS.textile',
15- 'RTSM.textile',
16- 'OPENJDK.textile')
17-
18-ANDROID_FILES = ('HOWTO_releasenotes.txt',
19- 'HOWTO_install.txt',
20- 'HOWTO_getsourceandbuild.txt',
21- 'HOWTO_flashfirmware.txt',
22- 'HOWTO_rtsm.txt')
23-
24-FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
25- 'HOWTO_install.txt': 'Binary Image Installation',
26- 'HOWTO_getsourceandbuild.txt': 'Building From Source',
27- 'HOWTO_flashfirmware.txt': 'Firmware',
28- 'HOWTO_rtsm.txt': 'RTSM',
29- 'README.textile': 'Release Notes',
30- 'INSTALL.textile': 'Binary Image Installation',
31- 'HACKING.textile': 'Building From Source',
32- 'FIRMWARE.textile': 'Firmware',
33- 'FASTMODELS.textile': 'Fast Models',
34- 'RTSM.textile': 'RTSM',
35- 'OPENJDK.textile': 'OpenJDK'}
36-
37-TAB_PRIORITY = ['Release Notes',
38- 'Binary Image Installation',
39- 'Building From Source',
40- 'Firmware',
41- 'Fast Models',
42- 'RTSM',
43- 'OpenJDK']
44
45=== modified file 'django/settings_snapshots.py'
46--- django/settings_snapshots.py 2013-10-31 21:56:44 +0000
47+++ django/settings_snapshots.py 2013-11-01 00:24:03 +0000
48@@ -24,39 +24,3 @@
49
50 SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
51 UPLOAD_PATH = '/srv/snapshots.linaro.org/uploads'
52-
53-# Render TEXTILE files settings.
54-LINUX_FILES = ('README.textile',
55- 'INSTALL.textile',
56- 'HACKING.textile',
57- 'FIRMWARE.textile',
58- 'FASTMODELS.textile',
59- 'RTSM.textile',
60- 'OPENJDK.textile')
61-
62-ANDROID_FILES = ('HOWTO_releasenotes.txt',
63- 'HOWTO_install.txt',
64- 'HOWTO_getsourceandbuild.txt',
65- 'HOWTO_flashfirmware.txt',
66- 'HOWTO_rtsm.txt')
67-
68-FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
69- 'HOWTO_install.txt': 'Binary Image Installation',
70- 'HOWTO_getsourceandbuild.txt': 'Building From Source',
71- 'HOWTO_flashfirmware.txt': 'Firmware',
72- 'HOWTO_rtsm.txt': 'RTSM',
73- 'README.textile': 'Release Notes',
74- 'INSTALL.textile': 'Binary Image Installation',
75- 'HACKING.textile': 'Building From Source',
76- 'FIRMWARE.textile': 'Firmware',
77- 'FASTMODELS.textile': 'Fast Models',
78- 'RTSM.textile': 'RTSM',
79- 'OPENJDK.textile': 'OpenJDK'}
80-
81-TAB_PRIORITY = ['Release Notes',
82- 'Binary Image Installation',
83- 'Building From Source',
84- 'Firmware',
85- 'Fast Models',
86- 'RTSM',
87- 'OpenJDK']
88
89=== modified file 'django/settings_staging_releases.py'
90--- django/settings_staging_releases.py 2013-10-31 21:56:44 +0000
91+++ django/settings_staging_releases.py 2013-11-01 00:24:03 +0000
92@@ -20,26 +20,3 @@
93
94 SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']
95 UPLOAD_PATH = '/srv/staging.releases.linaro.org/uploads'
96-
97-# Render TEXTILE files settings.
98-LINUX_FILES = ('README.textile',
99- 'INSTALL.textile',
100- 'HACKING.textile',
101- 'FIRMWARE.textile',
102- 'FASTMODELS.textile',
103- 'RTSM.textile',
104- 'OPENJDK.textile')
105-
106-FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
107- 'HOWTO_install.txt': 'Binary Image Installation',
108- 'HOWTO_getsourceandbuild.txt': 'Building From Source',
109- 'HOWTO_flashfirmware.txt': 'Firmware',
110- 'HOWTO_rtsm.txt': 'RTSM',
111- 'README.textile': 'Release Notes',
112- 'INSTALL.textile': 'Binary Image Installation',
113- 'HACKING.textile': 'Building From Source',
114- 'FIRMWARE.textile': 'Firmware',
115- 'FASTMODELS.textile': 'Fast Models',
116- 'RTSM.textile': 'RTSM',
117- 'OPENJDK.textile': 'OpenJDK'}
118-

Subscribers

People subscribed via source and target branches