Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: mgmt by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Jun 2006 02:40:13 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Allow DTD errors/warnings to be sent to stderr instead of syslog
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- xml.c 19 Jun 2006 12:03:58 -0000 1.94
+++ xml.c 21 Jun 2006 08:40:13 -0000 1.95
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.94 2006/06/19 12:03:58 andrew Exp $ */
+/* $Id: xml.c,v 1.95 2006/06/21 08:40:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2443,7 +2443,8 @@
#endif
gboolean
-validate_with_dtd(crm_data_t *xml_blob, const char *dtd_file)
+validate_with_dtd(
+ crm_data_t *xml_blob, gboolean to_logs, const char *dtd_file)
{
gboolean valid = TRUE;
#if HAVE_LIBXML2
@@ -2467,10 +2468,16 @@
cvp = xmlNewValidCtxt();
CRM_CHECK(cvp != NULL, crm_free(buffer); return TRUE);
-
- cvp->userData = (void *) LOG_ERR;
- cvp->error = (xmlValidityErrorFunc) cl_log;
- cvp->warning = (xmlValidityWarningFunc) cl_log;
+
+ if(to_logs) {
+ cvp->userData = (void *) LOG_ERR;
+ cvp->error = (xmlValidityErrorFunc) cl_log;
+ cvp->warning = (xmlValidityWarningFunc) cl_log;
+ } else {
+ cvp->userData = (void *) stderr;
+ cvp->error = (xmlValidityErrorFunc) fprintf;
+ cvp->warning = (xmlValidityWarningFunc) fprintf;
+ }
if (!xmlValidateDtd(cvp, doc, dtd)) {
crm_err("CIB does not validate against %s", dtd_file);
------------------------------
Message: 2
Date: Wed, 21 Jun 2006 02:40:13 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/cib
Modified Files:
io.c
Log Message:
Allow DTD errors/warnings to be sent to stderr instead of syslog
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- io.c 29 May 2006 14:50:03 -0000 1.69
+++ io.c 21 Jun 2006 08:40:13 -0000 1.70
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.69 2006/05/29 14:50:03 andrew Exp $ */
+/* $Id: io.c,v 1.70 2006/06/21 08:40:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -299,7 +299,7 @@
if(root != NULL) {
const char *ignore_dtd = crm_element_value(root, "ignore_dtd");
gboolean dtd_ok = validate_with_dtd(
- root, HA_LIBDIR"/heartbeat/crm.dtd");
+ root, TRUE, HA_LIBDIR"/heartbeat/crm.dtd");
if(dtd_ok == FALSE
#if CRM_DEPRECATED_SINCE_2_0_4
@@ -530,7 +530,7 @@
#endif
crm_is_true(ignore_dtd) == FALSE
&& validate_with_dtd(
- new_cib, HA_LIBDIR"/heartbeat/crm.dtd") == FALSE) {
+ new_cib, TRUE, HA_LIBDIR"/heartbeat/crm.dtd") == FALSE) {
error_code = cib_dtd_validation;
crm_err("Ignoring invalid CIB");
}
------------------------------
Message: 3
Date: Wed, 21 Jun 2006 02:45:32 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.zh_CN.po haclient.py.in
Log Message:
update Chinese labels
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.zh_CN.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- haclient.zh_CN.po 16 Jun 2006 09:53:52 -0000 1.5
+++ haclient.zh_CN.po 21 Jun 2006 08:45:32 -0000 1.6
@@ -669,3 +669,14 @@
msgid "press \"Default\" or \"Start\" button in toolbar/menu to start the
resource"
msgstr
"ç¹å»å·¥å
·æ¡æèåä¸ç\"缺ç\"æ\"å¼å§\"å¯ä»¥å¯å¨èµæº"
+msgid "Delete Attribute"
+msgstr "å é¤å±æ§"
+
+msgid "Add Attribute"
+msgstr "æ·»å å±æ§"
+
+msgid "Add Name/Value Pair"
+msgstr "æ·»å å称/å¼å¯¹"
+
+msgid "Reconnecting..."
+msgstr "éæ°è¿æ¥ä¸..."
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- haclient.py.in 21 Jun 2006 02:31:44 -0000 1.68
+++ haclient.py.in 21 Jun 2006 08:45:32 -0000 1.69
@@ -252,15 +252,15 @@
value_combo.child.set_text(option_dict[name][0])
global top_window
- dialog = gtk.Dialog("Add Name/Value Pair", top_window, gtk.DIALOG_MODAL,
+ dialog = gtk.Dialog(_("Add Name/Value Pair"), top_window,
gtk.DIALOG_MODAL,
(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL))
table = gtk.Table(2, 1, False)
- table.attach(gtk.Label("Value:"), 0, 1, 1, 2)
+ table.attach(gtk.Label(_("Value")+":"), 0, 1, 1, 2)
value_combo = gtk.combo_box_entry_new_text()
table.attach(value_combo, 1, 2, 1, 2)
- table.attach(gtk.Label("Name:"), 0, 1, 0, 1)
+ table.attach(gtk.Label(_("Name")+":"), 0, 1, 0, 1)
name_combo = gtk.combo_box_entry_new_text()
for name in option_dict.keys() :
name_combo.append_text(name)
@@ -324,7 +324,7 @@
widget.set_model(self.store)
cell = gtk.CellRendererText()
- tvcolumn = gtk.TreeViewColumn("name",cell,text=0)
+ tvcolumn = gtk.TreeViewColumn(_("Name"),cell,text=0)
widget.append_column(tvcolumn)
if pygtk_2_6_newer():
@@ -339,7 +339,7 @@
cell = gtk.CellRendererText()
cell.set_property('editable', True)
cell.connect('edited', edited_cb, (self.store, 1, call_back))
- tvcolumn = gtk.TreeViewColumn("value",cell,text=1)
+ tvcolumn = gtk.TreeViewColumn(_("Value"),cell,text=1)
self.call_back = call_back
self.widget.append_column(tvcolumn)
add_btn.connect("clicked", self.on_add)
@@ -1888,7 +1888,7 @@
if self.update_timer != -1 :
gobject.source_remove(self.update_timer)
else :
- window.statusbar.push(2,"Updating data from
server...")
+ window.statusbar.push(2,_("Updating data from
server..."))
self.update_timer = gobject.timeout_add(200,
self.update)
return True
elif event == None or event == "evt:disconnected" :
------------------------------
Message: 4
Date: Wed, 21 Jun 2006 03:47:01 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/pengine
Modified Files:
native.c
Log Message:
PE Memory leak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/native.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- native.c 8 Jun 2006 13:39:10 -0000 1.3
+++ native.c 21 Jun 2006 09:47:01 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.3 2006/06/08 13:39:10 andrew Exp $ */
+/* $Id: native.c,v 1.4 2006/06/21 09:47:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -415,9 +415,6 @@
action_t *delete = NULL;
action_t *refresh = NULL;
- char *stop = NULL;
- char *start = NULL;
-
if(rsc->failed) {
crm_debug_2("Resource %s not deleted from %s: failed",
rsc->id, node->details->uname);
@@ -433,9 +430,6 @@
return FALSE;
}
- stop = stop_key(rsc);
- start = start_key(rsc);
-
crm_notice("Removing %s from %s",
rsc->id, node->details->uname);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 71
********************************************
