Blame SOURCES/bz1057697-pcmk-use_native_dbus_library_for_upstart_support_to_avoid_problematic_use_of_threads.patch
|
 |
7100e8 |
commit c12446403e348c3d6f2763bcd370cea3e6b601d1
|
|
|
7100e8 |
Author: Andrew Beekhof <andrew@beekhof.net>
|
|
|
7100e8 |
Date: Mon Feb 3 14:44:51 2014 +1100
|
|
|
7100e8 |
|
|
|
7100e8 |
Fix: Bug rhbz#1057697 - Use native DBus library for upstart support to avoid problematic use of threads
|
|
|
7100e8 |
|
|
|
7100e8 |
(cherry picked from commit d7996e792844b98021061bd8ae74ab929f9b8ba7)
|
|
|
7100e8 |
|
|
|
7100e8 |
Conflicts:
|
|
|
7100e8 |
lib/services/upstart.c
|
|
|
7100e8 |
|
|
|
7100e8 |
diff --git a/configure.ac b/configure.ac
|
|
|
7100e8 |
index 628f46f..f90ccdc 100644
|
|
|
7100e8 |
--- a/configure.ac
|
|
|
7100e8 |
+++ b/configure.ac
|
|
|
7100e8 |
@@ -1173,7 +1173,7 @@ AC_CHECK_TYPES([DBusBasicValue],,,[[#include <dbus/dbus.h>]])
|
|
|
7100e8 |
|
|
|
7100e8 |
if test $HAVE_dbus = 1 -a "x${enable_upstart}" != xno; then
|
|
|
7100e8 |
HAVE_upstart=0
|
|
|
7100e8 |
- PCMK_FEATURES="$PCMK_FEATURES upstart"
|
|
|
7100e8 |
+ dnl PCMK_FEATURES="$PCMK_FEATURES upstart"
|
|
|
7100e8 |
fi
|
|
|
7100e8 |
|
|
|
7100e8 |
AC_DEFINE_UNQUOTED(SUPPORT_UPSTART, $HAVE_upstart, Support upstart based system services)
|
|
|
7100e8 |
diff --git a/lib/services/dbus.c b/lib/services/dbus.c
|
|
|
7100e8 |
index a9b1eba..66a98a0 100644
|
|
|
7100e8 |
--- a/lib/services/dbus.c
|
|
|
7100e8 |
+++ b/lib/services/dbus.c
|
|
|
7100e8 |
@@ -141,7 +141,6 @@ DBusMessage *pcmk_dbus_send_recv(DBusMessage *msg, DBusConnection *connection, D
|
|
|
7100e8 |
reply = NULL;
|
|
|
7100e8 |
}
|
|
|
7100e8 |
}
|
|
|
7100e8 |
- crm_trace("Was error: '%s' '%s'", error->name, error->message);
|
|
|
7100e8 |
|
|
|
7100e8 |
if(pending) {
|
|
|
7100e8 |
/* free the pending message handle */
|