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
=== modified file 'django/settings_releases.py'
--- django/settings_releases.py 2013-10-31 21:56:44 +0000
+++ django/settings_releases.py 2013-11-01 00:24:03 +0000
@@ -24,39 +24,3 @@
2424
25SERVED_PATHS = ['/srv/releases.linaro.org/www']25SERVED_PATHS = ['/srv/releases.linaro.org/www']
26UPLOAD_PATH = '/srv/releases.linaro.org/uploads'26UPLOAD_PATH = '/srv/releases.linaro.org/uploads'
27
28# Render TEXTILE files settings.
29LINUX_FILES = ('README.textile',
30 'INSTALL.textile',
31 'HACKING.textile',
32 'FIRMWARE.textile',
33 'FASTMODELS.textile',
34 'RTSM.textile',
35 'OPENJDK.textile')
36
37ANDROID_FILES = ('HOWTO_releasenotes.txt',
38 'HOWTO_install.txt',
39 'HOWTO_getsourceandbuild.txt',
40 'HOWTO_flashfirmware.txt',
41 'HOWTO_rtsm.txt')
42
43FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
44 'HOWTO_install.txt': 'Binary Image Installation',
45 'HOWTO_getsourceandbuild.txt': 'Building From Source',
46 'HOWTO_flashfirmware.txt': 'Firmware',
47 'HOWTO_rtsm.txt': 'RTSM',
48 'README.textile': 'Release Notes',
49 'INSTALL.textile': 'Binary Image Installation',
50 'HACKING.textile': 'Building From Source',
51 'FIRMWARE.textile': 'Firmware',
52 'FASTMODELS.textile': 'Fast Models',
53 'RTSM.textile': 'RTSM',
54 'OPENJDK.textile': 'OpenJDK'}
55
56TAB_PRIORITY = ['Release Notes',
57 'Binary Image Installation',
58 'Building From Source',
59 'Firmware',
60 'Fast Models',
61 'RTSM',
62 'OpenJDK']
6327
=== modified file 'django/settings_snapshots.py'
--- django/settings_snapshots.py 2013-10-31 21:56:44 +0000
+++ django/settings_snapshots.py 2013-11-01 00:24:03 +0000
@@ -24,39 +24,3 @@
2424
25SERVED_PATHS = ['/srv/snapshots.linaro.org/www']25SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
26UPLOAD_PATH = '/srv/snapshots.linaro.org/uploads'26UPLOAD_PATH = '/srv/snapshots.linaro.org/uploads'
27
28# Render TEXTILE files settings.
29LINUX_FILES = ('README.textile',
30 'INSTALL.textile',
31 'HACKING.textile',
32 'FIRMWARE.textile',
33 'FASTMODELS.textile',
34 'RTSM.textile',
35 'OPENJDK.textile')
36
37ANDROID_FILES = ('HOWTO_releasenotes.txt',
38 'HOWTO_install.txt',
39 'HOWTO_getsourceandbuild.txt',
40 'HOWTO_flashfirmware.txt',
41 'HOWTO_rtsm.txt')
42
43FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
44 'HOWTO_install.txt': 'Binary Image Installation',
45 'HOWTO_getsourceandbuild.txt': 'Building From Source',
46 'HOWTO_flashfirmware.txt': 'Firmware',
47 'HOWTO_rtsm.txt': 'RTSM',
48 'README.textile': 'Release Notes',
49 'INSTALL.textile': 'Binary Image Installation',
50 'HACKING.textile': 'Building From Source',
51 'FIRMWARE.textile': 'Firmware',
52 'FASTMODELS.textile': 'Fast Models',
53 'RTSM.textile': 'RTSM',
54 'OPENJDK.textile': 'OpenJDK'}
55
56TAB_PRIORITY = ['Release Notes',
57 'Binary Image Installation',
58 'Building From Source',
59 'Firmware',
60 'Fast Models',
61 'RTSM',
62 'OpenJDK']
6327
=== modified file 'django/settings_staging_releases.py'
--- django/settings_staging_releases.py 2013-10-31 21:56:44 +0000
+++ django/settings_staging_releases.py 2013-11-01 00:24:03 +0000
@@ -20,26 +20,3 @@
2020
21SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']21SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']
22UPLOAD_PATH = '/srv/staging.releases.linaro.org/uploads'22UPLOAD_PATH = '/srv/staging.releases.linaro.org/uploads'
23
24# Render TEXTILE files settings.
25LINUX_FILES = ('README.textile',
26 'INSTALL.textile',
27 'HACKING.textile',
28 'FIRMWARE.textile',
29 'FASTMODELS.textile',
30 'RTSM.textile',
31 'OPENJDK.textile')
32
33FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
34 'HOWTO_install.txt': 'Binary Image Installation',
35 'HOWTO_getsourceandbuild.txt': 'Building From Source',
36 'HOWTO_flashfirmware.txt': 'Firmware',
37 'HOWTO_rtsm.txt': 'RTSM',
38 'README.textile': 'Release Notes',
39 'INSTALL.textile': 'Binary Image Installation',
40 'HACKING.textile': 'Building From Source',
41 'FIRMWARE.textile': 'Firmware',
42 'FASTMODELS.textile': 'Fast Models',
43 'RTSM.textile': 'RTSM',
44 'OPENJDK.textile': 'OpenJDK'}
45

Subscribers

People subscribed via source and target branches