Merge lp:~arthur-she/lava-dispatcher/fix-for-bug-1175818 into lp:lava-dispatcher

[Arthur She]

Update variable MASTER_PS1 & MASTER_PS1_PATTERN according to config file

[Antonio Terceiro (terceiro)]

Hi Arthur,

Thanks for working on this.

> === modified file 'lava_dispatcher/device/master.py'
> --- lava_dispatcher/device/master.py 2013-05-02 21:43:14 +0000
> +++ lava_dispatcher/device/master.py 2013-05-08 09:30:42 +0000
> @@ -61,12 +61,16 @@
>
> class MasterImageTarget(Target):
>
> - MASTER_PS1 = 'root@master [rc=$(echo \$?)]# '
> - MASTER_PS1_PATTERN = 'root@master \[rc=(\d+)\]# '
> + MASTER_PS1 = ' [rc=$(echo \$?)]# '
> + MASTER_PS1_PATTERN = ' \[rc=(\d+)\]# '
>
> def __init__(self, context, config):
> super(MasterImageTarget, self).__init__(context, config)
>
> + # Update variable according to config file
> + self.MASTER_PS1 = self.config.master_str + self.MASTER_PS1
> + self.MASTER_PS1_PATTERN = self.config.master_str + self.MASTER_PS1_PATTERN
> +

The indentation is broken here, mixing tabs and spaces. Please adjust
your editor to not use tabs, and make sure the new code aligns
horizontally with the existing code.

> Target.android_deployment_data['boot_cmds'] = 'boot_cmds_android'
> Target.ubuntu_deployment_data['boot_cmds'] = 'boot_cmds'
> Target.oe_deployment_data['boot_cmds'] = 'boot_cmds_oe'

 review needs-fixing

--
Antonio Terceiro
Software Engineer - Linaro
http://www.linaro.org

review: Needs Fixing

[lp:~arthur-she/lava-dispatcher/fix-for-bug-1175818]

597. By Arthur She on 2013-05-09

fix for bug #1175818. fix indentation, use spaces instead of tabs.

[Arthur She (arthur-she)]

Hi Antonio,
Thanks, I'll modify it.

[Senthil Kumaran S (stylesen)]

Looks good +1 to merge.

review: Approve

=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2013-05-02 21:43:14 +0000
+++ lava_dispatcher/device/master.py	2013-05-09 03:03:26 +0000
@@ -61,12 +61,16 @@
 
 class MasterImageTarget(Target):
 
-    MASTER_PS1 = 'root@master [rc=$(echo \$?)]# '
-    MASTER_PS1_PATTERN = 'root@master \[rc=(\d+)\]# '
+    MASTER_PS1 = ' [rc=$(echo \$?)]# '
+    MASTER_PS1_PATTERN = ' \[rc=(\d+)\]# '
 
     def __init__(self, context, config):
         super(MasterImageTarget, self).__init__(context, config)
 
+        # Update variable according to config file
+        self.MASTER_PS1 = self.config.master_str + self.MASTER_PS1
+        self.MASTER_PS1_PATTERN = self.config.master_str + self.MASTER_PS1_PATTERN
+
         Target.android_deployment_data['boot_cmds'] = 'boot_cmds_android'
         Target.ubuntu_deployment_data['boot_cmds'] = 'boot_cmds'
         Target.oe_deployment_data['boot_cmds'] = 'boot_cmds_oe'