maas-images

Merge lp:~strikov-deactivatedaccount/maas-images/fix-dtb into lp:maas-images

  1. fix-dtb
  2. Merge into maas-ephemerals
Proposed by Oleg Strikov
Status: Merged
Merged at revision: 198
Proposed branch: lp:~strikov-deactivatedaccount/maas-images/fix-dtb
Merge into: lp:maas-images
Diff against target: 22 lines (+2/-3)
1 file modified
meph2/commands/cloudimg_sync.py (+2/-3)
To merge this branch: bzr merge lp:~strikov-deactivatedaccount/maas-images/fix-dtb
Reviewer Review Type Date Requested Status
Scott Moser Pending
Review via email: mp+251136@code.launchpad.net

Description of the change

meph2-cloudimg-sync: fix incorrectly propagated di-dtb, boot-dtb params

some parameters of the image (di-dtb, boot-dtb) have been incorrectly
propagated to next loop iterations. this patch re-initializes the state
on every loop iteration and fixes this issue.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'meph2/commands/cloudimg_sync.py'
2--- meph2/commands/cloudimg_sync.py 2015-02-26 16:02:11 +0000
3+++ meph2/commands/cloudimg_sync.py 2015-02-26 18:11:04 +0000
4@@ -246,9 +246,6 @@
5
6 newitems = {}
7
8- ikeys = ['boot-kernel', 'boot-initrd', 'di-kernel', 'di-initrd',
9- 'root-image.gz']
10-
11 mykinfo = self.releases[release]['kernels']
12
13 vername = flat['version_name']
14@@ -296,6 +293,8 @@
15 items = {}
16 di_keys = ['di-kernel', 'di-initrd']
17 boot_keys = ['boot-kernel', 'boot-initrd']
18+ ikeys = ['boot-kernel', 'boot-initrd', 'di-kernel',
19+ 'di-initrd', 'root-image.gz']
20
21 if kdata.get('dtb'):
22 ikeys.append('di-dtb')

Subscribers

People subscribed via source and target branches