Merge lp:~smoser/maas/lp1103716 into lp:maas/trunk

Proposed by Scott Moser on 2013-02-06
Status: Merged
Approved by: Scott Moser on 2013-02-06
Approved revision: 1429
Merged at revision: 1429
Proposed branch: lp:~smoser/maas/lp1103716
Merge into: lp:maas/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
src/metadataserver/commissioning/user_data.template (+1/-1)
To merge this branch: bzr merge lp:~smoser/maas/lp1103716
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2013-02-06 Approve on 2013-02-06
Review via email: mp+146863@code.launchpad.net

Commit message

fix typo in commiss template causing ipmi to always be passed.

  - if [ ! -z "power_settings" ]; then
  + if [ ! -z "$power_settings" ]; then
The literal string 'power_settings' will never be zero length.

Description of the change

fix simple typo

To post a comment you must log in.
Raphaël Badin (rvb) wrote :

Thanks for fixing this Scott. That's the kind of bug that gives me the goosebumps… anything we can do to improve the test coverage here and catch that kind of bug?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/metadataserver/commissioning/user_data.template'
2--- src/metadataserver/commissioning/user_data.template 2012-12-20 05:44:50 +0000
3+++ src/metadataserver/commissioning/user_data.template 2013-02-06 14:05:29 +0000
4@@ -154,7 +154,7 @@
5 pargs="--dhcp-if-static"
6 fi
7 power_settings=$(maas-ipmi-autodetect --configdir "$IPMI_CONFIG_D" ${pargs})
8- if [ ! -z "power_settings" ]; then
9+ if [ ! -z "$power_settings" ]; then
10 signal "--power-type=ipmi" "--power-parameters=${power_settings}" WORKING "finished [maas-ipmi-autodetect]"
11 fi
12