diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 551: yet another boot commands goof

Message ID 20130130184914.19028.82818.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Andy Doan Jan. 30, 2013, 6:49 p.m. UTC 
------------------------------------------------------------
revno: 551
committer: Andy Doan <andy.doan@linaro.org>
branch nick: lava-dispatcher
timestamp: Wed 2013-01-30 12:45:16 -0600
message:
  yet another boot commands goof
  
  the last fix assumed your boot_cmds was a predefined variable
  we have defined in our config.py code. This changes it to just
  search using the configparser so any boot_cmd can be defined and
  supported in config files
modified:
  lava_dispatcher/__init__.py
  lava_dispatcher/device/master.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/__init__.py'
--- lava_dispatcher/__init__.py	2013-01-30 04:34:29 +0000
+++ lava_dispatcher/__init__.py	2013-01-30 18:45:16 +0000
@@ -18,4 +18,4 @@ 
 # along
 # with this program; if not, see <http://www.gnu.org/licenses>.
 
-__version__ = (0, 32, 0, "final", 0)
+__version__ = (0, 32, 2, "final", 0)

=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2013-01-28 23:43:30 +0000
+++ lava_dispatcher/device/master.py	2013-01-30 18:45:16 +0000
@@ -416,7 +416,7 @@ 
             boot_cmds = options['boot_cmds'].value
 
         logging.info('boot_cmds attribute: %s', boot_cmds)
-        boot_cmds = getattr(self.config, boot_cmds)
+        boot_cmds = self.config.cp.get('__main__', boot_cmds)
         self._boot(string_to_list(boot_cmds.encode('ascii')))
 
     def _boot(self, boot_cmds):