Merge lp:~michihenning/storage-framework/remove-non-blocking into lp:storage-framework/devel

[Michi Henning]

Removed O_NONBLOCK from local client socket pair.

Removed O_NONBLOCK from local client socket pair.

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

FAILED: Continuous integration, rev:41
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/58/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/333/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/339
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/264
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/264
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/264
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/194/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/194/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[James Henstridge (jamesh)]

Looks good!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'src/qt/client/internal/local_client/DownloaderImpl.cpp'
--- src/qt/client/internal/local_client/DownloaderImpl.cpp	2016-07-22 00:17:24 +0000
+++ src/qt/client/internal/local_client/DownloaderImpl.cpp	2016-08-09 23:48:44 +0000
@@ -249,7 +249,7 @@
 {
     // Set up socket pair.
     int fds[2];
-    int rc = socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, fds);
+    int rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
     if (rc == -1)
     {
         // LCOV_EXCL_START

=== modified file 'src/qt/client/internal/local_client/UploaderImpl.cpp'
--- src/qt/client/internal/local_client/UploaderImpl.cpp	2016-07-26 01:51:26 +0000
+++ src/qt/client/internal/local_client/UploaderImpl.cpp	2016-08-09 23:48:44 +0000
@@ -351,7 +351,7 @@
 {
     // Set up socket pair.
     int fds[2];
-    int rc = socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, fds);
+    int rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
     if (rc == -1)
     {
         // LCOV_EXCL_START