Hello community,
here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2015-11-17 14:21:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pacemaker (Old)
and /work/SRC/openSUSE:Factory/.pacemaker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pacemaker"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2015-11-08 14:35:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2015-11-17 14:21:44.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Nov 16 17:49:49 UTC 2015 - ygao@suse.com
+
+- crm_report: Call "crm report" if available (bsc#950483)
+
+-------------------------------------------------------------------
+Thu Nov 12 11:18:49 UTC 2015 - ygao@suse.com
+
+- fencing: crm_resource --show-metadata drops documentation strings for fencing agents (bsc#950375)
+- Upstream version cs: 6f22ad7312b703289da5d24e918a78117a0825e1
+
+-------------------------------------------------------------------
@@ -146 +157 @@
-- xml: Reduce severity of noisy log message
+- xml: Reduce severity of noisy log message (bsc#950551)
Old:
----
pacemaker-1.1.13+git20151105.577898d.tar.bz2
New:
----
crm_report.in
pacemaker-1.1.13+git20151111.6f22ad7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pacemaker.spec ++++++
--- /var/tmp/diff_new_pack.f8cy1N/_old 2015-11-17 14:21:45.000000000 +0100
+++ /var/tmp/diff_new_pack.f8cy1N/_new 2015-11-17 14:21:45.000000000 +0100
@@ -100,13 +100,14 @@
Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version: 1.1.13+git20151105.577898d
+Version: 1.1.13+git20151111.6f22ad7
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
#Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
Source0: %{name}-%{version}.tar.bz2
+Source1: crm_report.in
Source100: pacemaker.rpmlintrc
Patch1: bug-806256_pacemaker-log-level-notice.patch
Patch2: bug-728579_pacemaker-stonith-dev-id.patch
@@ -493,6 +494,9 @@
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccrm_mon
%endif
+mv %{buildroot}%{_sbindir}/crm_report %{buildroot}%{_sbindir}/crm_report.pacemaker
+install -m 755 %{S:1} %{buildroot}%{_sbindir}/crm_report
+
%if %{with coverage}
GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov
mkdir -p $GCOV_BASE
@@ -709,6 +713,7 @@
%{_sbindir}/crm_shadow
%{_sbindir}/crm_simulate
%{_sbindir}/crm_report
+%{_sbindir}/crm_report.pacemaker
%{_sbindir}/crm_ticket
%exclude %{_datadir}/pacemaker/tests
%{_datadir}/pacemaker
++++++ _service ++++++
--- /var/tmp/diff_new_pack.f8cy1N/_old 2015-11-17 14:21:45.000000000 +0100
+++ /var/tmp/diff_new_pack.f8cy1N/_new 2015-11-17 14:21:45.000000000 +0100
@@ -11,7 +11,7 @@
<param name="version">1.1.13</param>
-->
<param name="versionformat">1.1.13+git%cd.%h</param>
- <param name="revision">577898dc4ac1efdb5989a996cb5f9ac60ed2eb7a</param>
+ <param name="revision">6f22ad7312b703289da5d24e918a78117a0825e1</param>
</service>
<service name="recompress" mode="disabled">
++++++ crm_report.in ++++++
#!/bin/sh
#
# Copyright (C) 2007 Dejan Muhamedagic
# Copyright (C) 2015 Kristoffer Gronlund
# Copyright (C) 2015 Gao,Yan
#
# Replaced with crm report
PARENT_COMMAND="$(ps -o comm= $PPID)"
PROG="$(basename "$0")"
die() {
echo "$PROG: $*"
exit 1
}
[ "$(basename "$PARENT_COMMAND")" = "crm" ] && die "called itself in a loop, aborting"
if which crm > /dev/null 2>&1; then
crm report "$@"
elif [ -x /usr/sbin/crm ]; then
/usr/sbin/crm report "$@"
else
#die "crm_report has been deprecated: Please install crmsh, which replaces it"
/usr/sbin/crm_report.pacemaker "$@"
fi
++++++ pacemaker-1.1.13+git20151105.577898d.tar.bz2 -> pacemaker-1.1.13+git20151111.6f22ad7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-1.1.13+git20151105.577898d/include/crm/common/logging.h new/pacemaker-1.1.13+git20151111.6f22ad7/include/crm/common/logging.h
--- old/pacemaker-1.1.13+git20151105.577898d/include/crm/common/logging.h 2015-11-06 00:53:37.000000000 +0100
+++ new/pacemaker-1.1.13+git20151111.6f22ad7/include/crm/common/logging.h 2015-11-12 12:14:50.000000000 +0100
@@ -61,6 +61,7 @@
{
xml_log_option_filtered = 0x0001,
xml_log_option_formatted = 0x0002,
+ xml_log_option_text = 0x0004, /* add this option to dump text into xml */
xml_log_option_diff_plus = 0x0010,
xml_log_option_diff_minus = 0x0020,
xml_log_option_diff_short = 0x0040,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-1.1.13+git20151105.577898d/include/crm/common/xml.h new/pacemaker-1.1.13+git20151111.6f22ad7/include/crm/common/xml.h
--- old/pacemaker-1.1.13+git20151105.577898d/include/crm/common/xml.h 2015-11-06 00:53:37.000000000 +0100
+++ new/pacemaker-1.1.13+git20151111.6f22ad7/include/crm/common/xml.h 2015-11-12 12:14:51.000000000 +0100
@@ -140,6 +140,8 @@
int write_xml_file(xmlNode * xml_node, const char *filename, gboolean compress);
char *dump_xml_formatted(xmlNode * msg);
+/* Also dump the text node with xml_log_option_text enabled */
+char *dump_xml_formatted_with_text(xmlNode * msg);
char *dump_xml_unformatted(xmlNode * msg);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-1.1.13+git20151105.577898d/lib/common/xml.c new/pacemaker-1.1.13+git20151111.6f22ad7/lib/common/xml.c
--- old/pacemaker-1.1.13+git20151105.577898d/lib/common/xml.c 2015-11-06 00:53:37.000000000 +0100
+++ new/pacemaker-1.1.13+git20151111.6f22ad7/lib/common/xml.c 2015-11-12 12:14:50.000000000 +0100
@@ -3786,8 +3786,7 @@
if (data->children) {
xmlNode *xChild = NULL;
-
- for (xChild = __xml_first_child(data); xChild != NULL; xChild = __xml_next(xChild)) {
+ for(xChild = data->children; xChild != NULL; xChild = xChild->next) {
crm_xml_dump(xChild, options, buffer, offset, max, depth + 1);
}
@@ -3801,6 +3800,33 @@
}
static void
+dump_xml_text(xmlNode * data, int options, char **buffer, int *offset, int *max, int depth)
+{
+ CRM_ASSERT(max != NULL);
+ CRM_ASSERT(offset != NULL);
+ CRM_ASSERT(buffer != NULL);
+
+ if (data == NULL) {
+ crm_trace("Nothing to dump");
+ return;
+ }
+
+ if (*buffer == NULL) {
+ *offset = 0;
+ *max = 0;
+ }
+
+ insert_prefix(options, buffer, offset, max, depth);
+
+ buffer_print(*buffer, *max, *offset, "%s", data->content);
+
+ if (options & xml_log_option_formatted) {
+ buffer_print(*buffer, *max, *offset, "\n");
+ }
+}
+
+
+static void
dump_xml_comment(xmlNode * data, int options, char **buffer, int *offset, int *max, int depth)
{
CRM_ASSERT(max != NULL);
@@ -3895,7 +3921,10 @@
dump_xml_element(data, options, buffer, offset, max, depth);
break;
case XML_TEXT_NODE:
- /* Ignore */
+ /* if option xml_log_option_text is enabled, then dump XML_TEXT_NODE */
+ if (options & xml_log_option_text) {
+ dump_xml_text(data, options, buffer, offset, max, depth);
+ }
return;
case XML_COMMENT_NODE:
dump_xml_comment(data, options, buffer, offset, max, depth);
@@ -3935,6 +3964,16 @@
}
char *
+dump_xml_formatted_with_text(xmlNode * an_xml_node)
+{
+ char *buffer = NULL;
+ int offset = 0, max = 0;
+
+ crm_xml_dump(an_xml_node, xml_log_option_formatted|xml_log_option_text, &buffer, &offset, &max, 0);
+ return buffer;
+}
+
+char *
dump_xml_formatted(xmlNode * an_xml_node)
{
char *buffer = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-1.1.13+git20151105.577898d/lib/fencing/st_client.c new/pacemaker-1.1.13+git20151111.6f22ad7/lib/fencing/st_client.c
--- old/pacemaker-1.1.13+git20151105.577898d/lib/fencing/st_client.c 2015-11-06 00:53:37.000000000 +0100
+++ new/pacemaker-1.1.13+git20151111.6f22ad7/lib/fencing/st_client.c 2015-11-12 12:14:50.000000000 +0100
@@ -1169,7 +1169,7 @@
freeXpathObject(xpathObj);
free(buffer);
- buffer = dump_xml_formatted(xml);
+ buffer = dump_xml_formatted_with_text(xml);
free_xml(xml);
if (!buffer) {
return -EINVAL;