Merge lp:~zyga/checkbox/fix-1302388 into lp:checkbox

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Daniel Manrique
Approved revision: 3026
Merged at revision: 3026
Proposed branch: lp:~zyga/checkbox/fix-1302388
Merge into: lp:checkbox
Diff against target: 15 lines (+1/-4)
1 file modified
checkbox-gui/gui-engine/gui-engine.cpp (+1/-4)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1302388
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+220694@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

oh cool :) thanks for the detailed explanation, and the fix looks simple enough. Makes sense.

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Note: this probably causes whitelist ordering regression. I'll take a break and confirm this

Sent from my BlackBerry 10 smartphone.
  Original Message
From: Daniel Manrique
Sent: czwartek, 22 maja 2014 19:54
To: <email address hidden>; Daniel Manrique
Reply To: <email address hidden>
Subject: [Merge] lp:~zkrynicki/checkbox/fix-1302388 into lp:checkbox

The proposal to merge lp:~zkrynicki/checkbox/fix-1302388 into lp:checkbox has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zkrynicki/checkbox/fix-1302388/+merge/220694
--
https://code.launchpad.net/~zkrynicki/checkbox/fix-1302388/+merge/220694
You are the owner of lp:~zkrynicki/checkbox/fix-1302388.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-gui/gui-engine/gui-engine.cpp'
2--- checkbox-gui/gui-engine/gui-engine.cpp 2014-05-22 15:39:53 +0000
3+++ checkbox-gui/gui-engine/gui-engine.cpp 2014-05-22 17:40:42 +0000
4@@ -424,10 +424,7 @@
5 * so we try to preserve that when we give it to UpdateDesiredJobList()
6 * and hopefully it is similar when we get it back from SessionStateRunList()
7 */
8- QList<QDBusObjectPath> temp_desired_job_list = \
9- JobTreeNode::FilteredJobs(m_desired_job_list,m_final_run_list);
10-
11- QStringList errors = UpdateDesiredJobList(m_session, temp_desired_job_list);
12+ QStringList errors = UpdateDesiredJobList(m_session, m_final_run_list);
13 if (errors.count() != 0) {
14 qDebug("UpdateDesiredJobList generated errors:");
15 for (int i=0; i<errors.count(); i++) {

Subscribers

People subscribed via source and target branches