Merge lp://qastaging/~cypressyew/checkbox/fix-autostart-vivid into lp://qastaging/checkbox

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 3845
Merged at revision: 3845
Proposed branch: lp://qastaging/~cypressyew/checkbox/fix-autostart-vivid
Merge into: lp://qastaging/checkbox
Diff against target: 12 lines (+1/-1)
1 file modified
checkbox-ng/contrib/checkbox-sru.desktop (+1/-1)
To merge this branch: bzr merge lp://qastaging/~cypressyew/checkbox/fix-autostart-vivid
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+262179@code.qastaging.launchpad.net

Description of the change

Rewrite the if statement from "&&" style to the normal if statement, in this way it won't return error value when the package does not exist.

Let's expand it:
sh -c "
if [ `pidof systemd` ]; then
    sudo systemctl start checkbox-ci-installed-notifier.service;
    /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1;
    sudo systemctl start checkbox-ci-mailer.service;
else
    sudo initctl emit checkbox-sru-started;
    /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1;
    sudo initctl emit checkbox-sru-finished;
fi"

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Looks good to me, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches