trust-store

Merge lp:~thomas-voss/trust-store/fix-1347739 into lp:trust-store

  1. fix-1347739
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Thomas Voß
Approved revision: 25
Merged at revision: 26
Proposed branch: lp:~thomas-voss/trust-store/fix-1347739
Merge into: lp:trust-store
Diff against target: 28 lines (+7/-1)
1 file modified
src/core/trust/resolve.cpp (+7/-1)
To merge this branch: bzr merge lp:~thomas-voss/trust-store/fix-1347739
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Alberto Mardegan (community) Approve
Review via email: mp+228253@code.launchpad.net

Commit message

Install executor on internal session bus connection.

Description of the change

Install executor on internal session bus connection.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Code looks OK, I'll try building it and using it in a second.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Yes, I confirm that this fixes the issue.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/trust-store-ci/21/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/21/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/trust-store-ci/23/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/23/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/23/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/23/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/core/trust/resolve.cpp'
2--- src/core/trust/resolve.cpp 2014-07-15 16:09:43 +0000
3+++ src/core/trust/resolve.cpp 2014-07-25 08:28:29 +0000
4@@ -24,6 +24,8 @@
5 #include "codec.h"
6 #include "dbus_interface.h"
7
8+#include <core/dbus/asio/executor.h>
9+
10 #include <core/dbus/service.h>
11 #include <core/dbus/stub.h>
12
13@@ -35,10 +37,14 @@
14 {
15 std::shared_ptr<dbus::Bus> session_bus()
16 {
17- return std::shared_ptr<dbus::Bus>
18+ std::shared_ptr<dbus::Bus> bus
19 {
20 new dbus::Bus(dbus::WellKnownBus::session)
21 };
22+
23+ bus->install_executor(dbus::asio::make_executor(bus));
24+
25+ return bus;
26 }
27
28 struct Store : public core::trust::Store

Subscribers

People subscribed via source and target branches