MAAS

Merge lp:~jtv/maas/bug-1238681 into lp:~maas-committers/maas/trunk

  1. bug-1238681
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 1702
Proposed branch: lp:~jtv/maas/bug-1238681
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 42 lines (+5/-5)
2 files modified
src/provisioningserver/import_images/config.py (+2/-2)
src/provisioningserver/import_images/tests/test_config.py (+3/-3)
To merge this branch: bzr merge lp:~jtv/maas/bug-1238681
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+190679@code.launchpad.net

Commit message

Treat ARCHES and RELEASES legacy import settings as space-separated lists, not strings.

Description of the change

When reading settings for the new ephemerals import script from the legacy shell-script config files, ARCHES and RELEASES were being read as regular strings. Should have been lists. And so we ended up with simplestreams filters like arch~(i|3|8|6|a|m|d|6|4) etc.

This branch fixes that.

Jeroen

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/import_images/config.py'
2--- src/provisioningserver/import_images/config.py 2013-10-09 11:15:04 +0000
3+++ src/provisioningserver/import_images/config.py 2013-10-11 14:57:37 +0000
4@@ -92,11 +92,11 @@
5 data_dir = legacy_config.get('DATA_DIR')
6 releases = legacy_config.get('RELEASES')
7 if arches is not None:
8- config['boot']['architectures'] = arches
9+ config['boot']['architectures'] = arches.split()
10 if data_dir is not None:
11 config['boot']['ephemeral']['images_directory'] = data_dir
12 if releases is not None:
13- config['boot']['ephemeral']['releases'] = releases
14+ config['boot']['ephemeral']['releases'] = releases.split()
15
16 return config['boot'] != loaded_boot_config
17
18
19=== modified file 'src/provisioningserver/import_images/tests/test_config.py'
20--- src/provisioningserver/import_images/tests/test_config.py 2013-10-09 10:59:33 +0000
21+++ src/provisioningserver/import_images/tests/test_config.py 2013-10-11 14:57:37 +0000
22@@ -164,10 +164,10 @@
23 self.assertTrue(changed)
24 self.assertEqual(
25 {
26- 'architectures': ' '.join(arches),
27+ 'architectures': arches,
28 'ephemeral': {
29 'images_directory': legacy_options['DATA_DIR'],
30- 'releases': ' '.join(releases),
31+ 'releases': releases,
32 },
33 },
34 config['boot'])
35@@ -190,7 +190,7 @@
36 {'boot': {'ephemeral': {'images_directory': images_directory}}},
37 config)
38
39- def test_does_nothing_if_legacy_config_has_no_items(self):
40+ def test_uses_config_settings_where_no_legacy_value_set(self):
41 make_legacy_config(self, {})
42 config = {'boot': {'ephemeral': {}}}
43