Merge lp:~bladernr/checkbox/860651_redo into lp:checkbox

Proposed by Jeff Lane on 2011-09-28
Status: Merged
Merged at revision: 1086
Proposed branch: lp:~bladernr/checkbox/860651_redo
Merge into: lp:checkbox
Diff against target: 57 lines (+6/-6)
1 file modified
jobs/mediacard.txt.in (+6/-6)
To merge this branch: bzr merge lp:~bladernr/checkbox/860651_redo
Reviewer Review Type Date Requested Status
Daniel Manrique 2011-09-28 Approve on 2011-09-29
Review via email: mp+77397@code.launchpad.net

Description of the change

Reverted the biggest part of my other attempt and left this at ONLY changing the power-management/suspend_advanced deps to suspend/suspend_advanced. We can revisit moving the jobs later if necessary.

To post a comment you must log in.
Daniel Manrique (roadmr) wrote :

Thanks for fixing the borked dependencies. Merging!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/mediacard.txt.in'
2--- jobs/mediacard.txt.in 2011-09-08 16:52:42 +0000
3+++ jobs/mediacard.txt.in 2011-09-28 19:58:15 +0000
4@@ -11,7 +11,7 @@
5
6 plugin: manual
7 name: mediacard/sd_after_suspend
8-depends: power-management/suspend_advanced mediacard/sd
9+depends: suspend/suspend_advanced mediacard/sd
10 _description:
11 Secure Digital (SD) media card support re-verification:
12 1.- Plug a SD media card into the computer.
13@@ -34,7 +34,7 @@
14
15 plugin: manual
16 name: mediacard/sdhc_after_suspend
17-depends: power-management/suspend_advanced mediacard/sdhc
18+depends: suspend/suspend_advanced mediacard/sdhc
19 _description:
20 Secure Digital High Capacity (SDHC) media card support re-verification:
21 1.- Plug a SDHC media card into the computer.
22@@ -57,7 +57,7 @@
23
24 plugin: manual
25 name: mediacard/mmc_after_suspend
26-depends: power-management/suspend_advanced mediacard/mmc
27+depends: suspend/suspend_advanced mediacard/mmc
28 _description:
29 Multi Media Card (MMC) media card support re-verification:
30 1.- Plug a MMC media card into the computer.
31@@ -80,7 +80,7 @@
32
33 plugin: manual
34 name: mediacard/ms_after_suspend
35-depends: power-management/suspend_advanced mediacard/ms
36+depends: suspend/suspend_advanced mediacard/ms
37 _description:
38 Memory Stick (MS) media card support re-verification:
39 1.- Plug a MS media card into the computer.
40@@ -103,7 +103,7 @@
41
42 plugin: manual
43 name: mediacard/msp_after_suspend
44-depends: power-management/suspend_advanced mediacard/msp
45+depends: suspend/suspend_advanced mediacard/msp
46 _description:
47 Memory Stick Pro (MSP) media card support re-verification:
48 1.- Plug a MSP media card into the computer.
49@@ -126,7 +126,7 @@
50
51 plugin: manual
52 name: mediacard/cf_after_suspend
53-depends: power-management/suspend_advanced mediacard/cf
54+depends: suspend/suspend_advanced mediacard/cf
55 _description:
56 Compact Flash (CF) media card support re-verification:
57 1.- Plug a CF media card into the computer.

Subscribers

People subscribed via source and target branches