Merge lp:~clint-fewbar/gearmand/fix-postgresql-path into lp:gearmand/1.0

Proposed by Clint Byrum on 2012-04-18
Status: Merged
Approved by: Brian Aker on 2012-04-19
Approved revision: 534
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/gearmand/fix-postgresql-path
Merge into: lp:gearmand/1.0
Diff against target: 12 lines (+2/-2)
1 file modified
libgearman-server/plugins/queue/postgres/queue.cc (+2/-2)
To merge this branch: bzr merge lp:~clint-fewbar/gearmand/fix-postgresql-path
Reviewer Review Type Date Requested Status
Tangent 2012-04-18 Pending
Review via email: mp+102593@code.launchpad.net

Description of the change

Fixes path mis-merged in fix for bug #927006

To post a comment you must log in.
Brian Aker (brianaker) wrote :

Hi,

The issue with this is that on RHEL/Fedora the postgres piece of the include path does not exist.

Cheers,
 -Brian

On Apr 18, 2012, at 6:17 PM, Brian Aker wrote:

> The proposal to merge lp:~clint-fewbar/gearmand/fix-postgresql-path into lp:gearmand has been updated.
>
> Status: Needs review => Approved
>
> For more details, see:
> https://code.launchpad.net/~clint-fewbar/gearmand/fix-postgresql-path/+merge/102593
> --
> https://code.launchpad.net/~clint-fewbar/gearmand/fix-postgresql-path/+merge/102593
> Your team Gearman-developers is subscribed to branch lp:gearmand.

Brian Aker (brianaker) wrote :

I believe this is now fixed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgearman-server/plugins/queue/postgres/queue.cc'
2--- libgearman-server/plugins/queue/postgres/queue.cc 2012-03-05 05:28:26 +0000
3+++ libgearman-server/plugins/queue/postgres/queue.cc 2012-04-18 21:28:39 +0000
4@@ -50,8 +50,8 @@
5 #include <libgearman-server/plugins/queue/base.h>
6
7 #if defined(HAVE_LIBPQ) and HAVE_LIBPQ
8-#include <libpq-fe.h>
9-#include <pg_config_manual.h>
10+#include <postgresql/libpq-fe.h>
11+#include <postgresql/pg_config_manual.h>
12 #endif
13
14

Subscribers

People subscribed via source and target branches