Merge lp:~aacid/policykit-unity8/no_crash_already_running into lp:policykit-unity8

[Albert Astals Cid]

Don't crash if there's already one agent running

Just exit with error

No need to get apport to show up just because the app was already running and failed to start

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:15
https://jenkins.canonical.com/unity-api-1/job/lp-policykit-unity8-ci/8/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/912
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/919
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/722/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-policykit-unity8-ci/8/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

[Albert Astals Cid (aacid)]

Code looks nice, but for some reason it makes this thing stop workign altogether i.e. "pkexec ls" gives you a command line prompt instead a snap decision, so i'll reject this.

review: Disapprove

Unmerged revisions

15. By Albert Astals Cid on 2016-10-27

Don't crash if there's already one agent running

Just exit with error

=== modified file 'service/main.cpp'
--- service/main.cpp	2016-04-09 13:48:52 +0000
+++ service/main.cpp	2016-10-27 08:30:09 +0000
@@ -31,10 +31,14 @@
 int main(int argc, char* argv[])
 {
     auto auths = std::make_shared<AuthManager>();
-    auto agent = std::make_shared<Agent>(auths);
+    try {
+        auto agent = std::make_shared<Agent>(auths);
+        g_debug("PolicyKit Agent Started");
+    } catch (const std::runtime_error &e) {
+        retval.set_value(-1);
+    }
 
     std::signal(SIGTERM, [](int signal) -> void { retval.set_value(0); });
 
-    g_debug("PolicyKit Agent Started");
     return retval.get_future().get();
 }