Merge lp:~cemil-azizoglu/pay-service/mir-deprecations into lp:pay-service

Proposed by Cemil Azizoglu on 2017-02-20
Status: Needs review
Proposed branch: lp:~cemil-azizoglu/pay-service/mir-deprecations
Merge into: lp:pay-service
Diff against target: 48 lines (+8/-15)
2 files modified
debian/control (+1/-1)
service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c (+7/-14)
To merge this branch: bzr merge lp:~cemil-azizoglu/pay-service/mir-deprecations
Reviewer Review Type Date Requested Status
Alberto Aguirre (community) Approve on 2017-03-31
unity-api-1-bot continuous-integration Approve on 2017-03-16
Unity API Team 2017-02-20 Pending
Review via email: mp+317801@code.launchpad.net

Commit message

Updated to do away with Mir deprecations.

Description of the change

Updated to do away with Mir deprecations.

To post a comment you must log in.
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:141
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/18/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1698/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1705
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1480/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1480/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1480/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1480/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1480/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1480/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/18/rebuild

review: Needs Fixing (continuous-integration)
142. By Cemil Azizoglu on 2017-03-16

merge trunk

unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:142
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/19/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1796
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1803
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1579
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1579/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1579
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1579/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1579
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1579/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1579
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1579/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1579
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1579/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1579
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1579/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/19/rebuild

review: Approve (continuous-integration)
Alberto Aguirre (albaguirre) wrote :

LGTM

review: Approve

Unmerged revisions

142. By Cemil Azizoglu on 2017-03-16

merge trunk

141. By Cemil Azizoglu on 2017-02-20

Address mir deprecations.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-02-11 00:15:05 +0000
3+++ debian/control 2017-03-16 20:37:22 +0000
4@@ -21,7 +21,7 @@
5 libdbustest1-dev,
6 libglib2.0-dev,
7 libgtest-dev,
8- libmirclient-dev (>= 0.5),
9+ libmirclient-dev (>= 0.26.1),
10 libprocess-cpp-dev (>= 2.0.0),
11 libproperties-cpp-dev,
12 libtrust-store-dev,
13
14=== modified file 'service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c'
15--- service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c 2016-03-09 02:57:02 +0000
16+++ service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c 2017-03-16 20:37:22 +0000
17@@ -18,24 +18,17 @@
18 #include "_cgo_export.h"
19 #include "mir_prompt_session_helper.h"
20
21-static void _fd_getter (MirPromptSession * session, size_t count,
22- int const * fdsin, void * pfds)
23+int mir_prompt_session_get_fd(MirPromptSession * session)
24 {
25+ int fd = 0;
26+ size_t count = mir_prompt_session_new_fds_for_prompt_providers_sync(
27+ session,
28+ 1,
29+ &fd);
30+
31 if (count != 1) {
32 g_warning("Didn't get the right number of FDs");
33- return;
34 }
35
36- int * fds = (int *)pfds;
37- fds[0] = fdsin[0];
38-}
39-
40-int mir_prompt_session_get_fd(MirPromptSession * session)
41-{
42- int fd = 0;
43- MirWaitHandle * wait = mir_prompt_session_new_fds_for_prompt_providers(session, 1, _fd_getter, &fd);
44-
45- mir_wait_for(wait);
46-
47 return fd;
48 }

Subscribers

People subscribed via source and target branches

to all changes: