Attached a temp fix to make the compilation go through.
-Santosh
On 07/23/2014 02:50 PM, Santosh Pradhan wrote:
On 07/23/2014 01:04 PM, Avra Sengupta wrote:
libxml could be our other dependency issue - you should build without
XML --disable-xml-output ?
cmockery has no dependency on libxml.
geo-rep packages have dependency on libxml. So I can't install
gluster with --disable-xml-output.
Try --disable-xml-output --disable-georeplication. But it seems to be
breaking because of Rajesh's fix of XML cli interface for snapshot.
https://bugzilla.redhat.com/show_bug.cgi?id=1122186
Best R,
Santosh
I have a vm which isn't connected to the external network and hence
cannot install cmockery on that vm through the epel repo.
_______________________________________________
Gluster-devel mailing list
Gluster-devel@xxxxxxxxxxx
http://supercolony.gluster.org/mailman/listinfo/gluster-devel
_______________________________________________
Gluster-devel mailing list
Gluster-devel@xxxxxxxxxxx
http://supercolony.gluster.org/mailman/listinfo/gluster-devel
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index b7c6691..53e1436 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -8568,6 +8568,7 @@ cli_snapshot_status (dict_t *dict, gf_cli_rsp *rsp,
goto out;
}
+#if (HAVE_LIB_XML)
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_snapshot_status_per_snap (local->writer,
local->doc,
@@ -8578,13 +8579,16 @@ cli_snapshot_status (dict_t *dict, gf_cli_rsp *rsp,
goto out;
}
} else {
+#endif
ret = cli_get_single_snap_status (dict, key);
if (ret) {
gf_log ("cli", GF_LOG_ERROR, "Could not fetch "
"status of snap");
goto out;
}
+#if (HAVE_LIB_XML)
}
+#endif
ret = 0;
out:
diff --git a/cli/src/cli.h b/cli/src/cli.h
index 74d3599..b451d39 100644
--- a/cli/src/cli.h
+++ b/cli/src/cli.h
@@ -393,9 +393,13 @@ cli_xml_output_snap_status_begin (cli_local_t *local, int op_ret, int op_errno,
char *op_errstr);
int
cli_xml_output_snap_status_end (cli_local_t *local);
+
+#if (HAVE_LIB_XML)
int
cli_xml_snapshot_status_per_snap (xmlTextWriterPtr writer, xmlDocPtr doc,
dict_t *dict, const char *keyprefix);
+#endif
+
int
cli_xml_output_snapshot (int cmd_type, dict_t *dict, int op_ret,
int op_errno, char *op_errstr);
_______________________________________________
Gluster-devel mailing list
Gluster-devel@xxxxxxxxxxx
http://supercolony.gluster.org/mailman/listinfo/gluster-devel
