Merge lp:~brianaker/gearmand/connection into lp:gearmand

Proposed by Brian Aker on 2013-06-28
Status: Merged
Merged at revision: 791
Proposed branch: lp:~brianaker/gearmand/connection
Merge into: lp:gearmand
Diff against target: 20 lines (+9/-1)
1 file modified
libgearman/connection.cc (+9/-1)
To merge this branch: bzr merge lp:~brianaker/gearmand/connection
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-06-28 Pending
Review via email: mp+171957@code.launchpad.net
To post a comment you must log in.
lp:~brianaker/gearmand/connection updated on 2013-06-28
791. By Tangent.Org Continuous Integration on 2013-06-28

Merge lp:~brianaker/gearmand/connection Build: jenkins-Gearmand-685

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgearman/connection.cc'
2--- libgearman/connection.cc 2013-06-23 19:09:29 +0000
3+++ libgearman/connection.cc 2013-06-28 05:28:36 +0000
4@@ -1227,7 +1227,15 @@
5 {
6 rval= fcntl (fd, F_SETFD, flags | FD_CLOEXEC);
7 } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
8- // we currently ignore the case where rval is -1
9+
10+ if (rval == -1)
11+ {
12+ gearman_perror(universal, "fcntl (fd, F_SETFD, flags | FD_CLOEXEC)");
13+ }
14+ }
15+ else
16+ {
17+ gearman_perror(universal, "fcntl(fd, F_GETFD, 0)");
18 }
19 }
20 }

Subscribers

People subscribed via source and target branches

to all changes: