Checkbox

Merge lp:~roadmr/checkbox/1457505 into lp:checkbox

  1. 1457505
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 3805
Merged at revision: 3805
Proposed branch: lp:~roadmr/checkbox/1457505
Merge into: lp:checkbox
Diff against target: 39 lines (+4/-4)
1 file modified
providers/plainbox-provider-checkbox/jobs/info.txt.in (+4/-4)
To merge this branch: bzr merge lp:~roadmr/checkbox/1457505
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Zygmunt Krynicki (community) Approve
Review via email: mp+259781@code.launchpad.net

Commit message

providers:checkbox: Fix wrong usage of recovery_info script in some info jobs

Description of the change

providers:checkbox: Fix wrong usage of recovery_info script in some info jobs

This is kinda hard to test (unless you're on a system with an OEM install which has the recovery partition) but running plainbox dev run for the updated jobs should NO longer yield a message about bad commandline parameters. I tested this on a Dell system which has an HP image installed so it was a bit flaky but the non-dell-dependent parts worked fine.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Looks good

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Thanks for the quick fix.+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/jobs/info.txt.in'
2--- providers/plainbox-provider-checkbox/jobs/info.txt.in 2015-05-20 10:11:59 +0000
3+++ providers/plainbox-provider-checkbox/jobs/info.txt.in 2015-05-21 15:12:29 +0000
4@@ -283,7 +283,7 @@
5 estimated_duration: 0.2
6 _summary: Check existence of recovery partition
7 _description: Check existence of recovery partition
8-command: recovery_info --check-recovery-partition
9+command: recovery_info
10
11 plugin: shell
12 id: info/detect_dell_recovery
13@@ -293,7 +293,7 @@
14 estimated_duration: 0.2
15 _summary: Check the recovery type is dell or not
16 _description: Check the recovery type is dell or not
17-command: recovery_info --check-recovery-type DELL
18+command: recovery_info checktype DELL
19
20 plugin: attachment
21 id: recovery_info_attachment
22@@ -309,7 +309,7 @@
23 Example:
24 image_version: somerville-trusty-amd64-20140620-0
25 bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
26-command: recovery_info --show-version
27+command: recovery_info version
28
29 plugin: attachment
30 id: dell_bto_xml_attachment
31@@ -322,7 +322,7 @@
32 The information include:
33 - fish packages
34 - dell recovery stage 2 boot log
35-command: recovery_info --readfile bto.xml
36+command: recovery_info file bto.xml
37
38 plugin: attachment
39 id: info/kvm_output

Subscribers

People subscribed via source and target branches