Send Linux-ha-cvs mailing list submissions to
[email protected]
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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: debian by horms from
([email protected])
3. Linux-HA CVS: debian by horms from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 11 Jun 2006 23:57:05 -0600 (MDT)
From: [email protected]
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.py.in
Log Message:
prompt user when leaving a changed but not applied view
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- haclient.py.in 9 Jun 2006 09:24:35 -0000 1.52
+++ haclient.py.in 12 Jun 2006 05:57:04 -0000 1.53
@@ -131,10 +131,9 @@
dialog.destroy()
-def confirmbox(msg) :
+def confirmbox(msg, button=(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
gtk.RESPONSE_NO)) :
global top_window
- dialog = gtk.Dialog(_("Confirm"), top_window, gtk.DIALOG_MODAL,
- (gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
gtk.RESPONSE_NO))
+ dialog = gtk.Dialog(_("Confirm"), top_window, gtk.DIALOG_MODAL,button)
label = gtk.Label(msg)
dialog.vbox.add(label)
dialog.set_default_response(gtk.RESPONSE_YES)
@@ -144,7 +143,7 @@
ret = dialog.run()
top_window = save_top_window
dialog.destroy()
- return ret == gtk.RESPONSE_YES
+ return ret
def on_label_active(event, widget, url) :
webbrowser.open(url)
@@ -384,6 +383,7 @@
class Tree :
store = None
widget = None
+ last_iter = None
def on_right_click(self, widget, event) :
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3 :
menu = None
@@ -407,14 +407,18 @@
def on_cursor_changed(self, treeview, selection) :
(model, iter) = selection.get_selected()
+ if not window.can_change_view() :
+ if self.last_iter != None :
+ selection.select_iter(self.last_iter)
+ return
if iter == None :
window.select_view(None, None, None)
return
type = model.get_value(iter, 2)
name = model.get_value(iter, 0)
status = model.get_value(iter, 1)
-
window.select_view(type, name, status)
+ self.last_iter = iter
def select_row(self, model, path, iter, user_data):
name, type = user_data
@@ -615,6 +619,7 @@
glade = None
widget = None
name = "emptyview"
+ changed = False
def __init__(self, param=None) :
self.param = param
@@ -624,15 +629,18 @@
self.glade.get_widget("apply").connect("clicked",
self.on_apply)
if self.glade.get_widget("reset") != None :
self.glade.get_widget("reset").connect("clicked",
self.on_reset)
+
def update(self) :
if self.glade.get_widget("apply") != None :
self.glade.get_widget("apply").set_property("sensitive", False)
if self.glade.get_widget("reset") != None :
self.glade.get_widget("reset").set_property("sensitive", False)
+ self.changed = False
def on_changed(self, widget) :
self.glade.get_widget("apply").set_property("sensitive", True)
self.glade.get_widget("reset").set_property("sensitive", True)
+ self.changed = True
def on_reset(self, widget):
self.update()
@@ -640,6 +648,7 @@
def on_apply(self, widget):
self.glade.get_widget("apply").set_property("sensitive", False)
self.glade.get_widget("reset").set_property("sensitive", False)
+ self.changed = False
def on_after_show(self) :
pass
@@ -1317,7 +1326,21 @@
self.tree.update()
self.statusbar.pop(2)
return False
-
+
+ def can_change_view(self) :
+ if not self.cur_view.changed :
+ return True
+ ret = confirmbox("The data of current view has been changed.
\nApply the change?",
+ (gtk.STOCK_YES, gtk.RESPONSE_YES,
+ gtk.STOCK_NO, gtk.RESPONSE_NO,
+ gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+ if ret == gtk.RESPONSE_YES :
+ self.cur_view.on_apply(self.cur_view.widget)
+ return True
+ if ret == gtk.RESPONSE_NO :
+ return True
+ return False
+
def select_view(self, type, name, status) :
for child in self.view_widget.get_children() :
self.view_widget.remove(child)
@@ -1384,11 +1407,11 @@
print uuid()
def on_standby(self, action) :
- if confirmbox(_("Make") +" " +self.cur_name + " "
+_("standby")+"?") :
+ if confirmbox(_("Make") +" " +self.cur_name + " "
+_("standby")+"?") == gtk.RESPONSE_YES:
manager.do_cmd("standby\n"+self.cur_name + "\n" + "on")
def on_active(self, action) :
- if confirmbox(_("Make") +" " +self.cur_name + " " +
_("active")+"?") :
+ if confirmbox(_("Make") +" " +self.cur_name + " " +
_("active")+"?") == gtk.RESPONSE_YES :
manager.do_cmd("standby\n"+self.cur_name + "\n" + "off")
def on_add_item(self, action) :
@@ -1431,7 +1454,7 @@
manager.update_constraint("rsc_colocation",
colocation)
def on_del_item(self, action) :
- if confirmbox(_("Delete") + " "+self.cur_type + " " +
self.cur_name + "?"):
+ if confirmbox(_("Delete") + " "+self.cur_type + " " +
self.cur_name + "?") == gtk.RESPONSE_YES:
if self.cur_type in
[_("native"),_("group"),_("clone"),_("master")] :
manager.do_cmd("del_rsc\n"+self.cur_name)
elif self.cur_type == _("place") :
------------------------------
Message: 2
Date: Mon, 12 Jun 2006 01:46:53 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
changelog heartbeat-2.files rules
Log Message:
Debian Paackaging Update
heartbeat-2 (2.0.5-4) unstable; urgency=low
* Move IPv6addr from /etc/ha.d/resource.d/ into /usr/lib/heartbeat,
and then symlink that back into /etc/ha.d/resource.d/ as binaries
are not allowed in /etc (closes: #372850)
-- Simon Horman <[EMAIL PROTECTED]> Mon, 12 Jun 2006 16:23:59 +0900
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- changelog 5 Jun 2006 10:15:17 -0000 1.65
+++ changelog 12 Jun 2006 07:46:52 -0000 1.66
@@ -1,3 +1,11 @@
+heartbeat-2 (2.0.5-4) unstable; urgency=low
+
+ * Move IPv6addr from /etc/ha.d/resource.d/ into /usr/lib/heartbeat,
+ and then symlink that back into /etc/ha.d/resource.d/ as binaries
+ are not allowed in /etc (closes: #372850)
+
+ -- Simon Horman <[EMAIL PROTECTED]> Mon, 12 Jun 2006 16:23:59 +0900
+
heartbeat-2 (2.0.5-3) unstable; urgency=low
* Fix libgnutls binary dependancy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- heartbeat-2.files 8 Jun 2006 17:05:58 -0000 1.21
+++ heartbeat-2.files 12 Jun 2006 07:46:52 -0000 1.22
@@ -92,6 +92,7 @@
usr/lib/heartbeat/ipctransientclient
usr/lib/heartbeat/ipctransientserver
usr/lib/heartbeat/ipfail
+usr/lib/heartbeat/IPv6addr
usr/lib/heartbeat/login.png
usr/lib/heartbeat/logout.png
usr/lib/heartbeat/logtest
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/rules,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- rules 11 Feb 2006 11:21:30 -0000 1.37
+++ rules 12 Jun 2006 07:46:52 -0000 1.38
@@ -102,6 +102,11 @@
cd $(DTMP)/etc/ha.d/resource.d \
&& ln -s /usr/sbin/ldirectord ldirectord
cd $(DTMP)/etc/ && ln -s ha.d heartbeat
+
+ # Binaries are not allowed in /etc
+ mv $(DTMP)/etc/ha.d/resource.d/IPv6addr $(DTMP)/usr/lib/heartbeat
+ cd $(DTMP)/etc/ha.d/resource.d/ && ln -s /usr/lib/heartbeat/IPv6addr .
+
dh_movefiles --source=debian/tmp
binary-indep: build install
------------------------------
Message: 3
Date: Mon, 12 Jun 2006 01:47:19 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
changelog heartbeat.files rules
Log Message:
Debian Packaging Update
heartbeat (1.2.4-9) unstable; urgency=low
* Move IPv6addr from /etc/ha.d/resource.d/ into /usr/lib/heartbeat,
and then symlink that back into /etc/ha.d/resource.d/ as binaries
are not allowed in /etc (closes: #369815)
-- Simon Horman <[EMAIL PROTECTED]> Mon, 12 Jun 2006 15:59:02 +0900
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.40
retrieving revision 1.17.2.41
diff -u -3 -r1.17.2.40 -r1.17.2.41
--- changelog 19 May 2006 02:00:26 -0000 1.17.2.40
+++ changelog 12 Jun 2006 07:47:18 -0000 1.17.2.41
@@ -1,3 +1,11 @@
+heartbeat (1.2.4-9) unstable; urgency=low
+
+ * Move IPv6addr from /etc/ha.d/resource.d/ into /usr/lib/heartbeat,
+ and then symlink that back into /etc/ha.d/resource.d/ as binaries
+ are not allowed in /etc (closes: #369815)
+
+ -- Simon Horman <[EMAIL PROTECTED]> Mon, 12 Jun 2006 15:59:02 +0900
+
heartbeat (1.2.4-8) unstable; urgency=low
* Make use of invoke-rc.d
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/Attic/heartbeat.files,v
retrieving revision 1.14.2.14
retrieving revision 1.14.2.15
diff -u -3 -r1.14.2.14 -r1.14.2.15
--- heartbeat.files 25 Aug 2005 06:48:54 -0000 1.14.2.14
+++ heartbeat.files 12 Jun 2006 07:47:18 -0000 1.14.2.15
@@ -35,6 +35,7 @@
usr/lib/heartbeat/heartbeat
usr/lib/heartbeat/ipfail
usr/lib/heartbeat/ipctest
+usr/lib/heartbeat/IPv6addr
usr/lib/heartbeat/mach_down
usr/lib/heartbeat/cts/CM_fs.py
usr/lib/heartbeat/cts/CM_hb.py
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/rules,v
retrieving revision 1.15.2.17
retrieving revision 1.15.2.18
diff -u -3 -r1.15.2.17 -r1.15.2.18
--- rules 25 Aug 2005 06:48:54 -0000 1.15.2.17
+++ rules 12 Jun 2006 07:47:18 -0000 1.15.2.18
@@ -98,6 +98,11 @@
cd $(DTMP)/etc/ha.d/resource.d \
&& ln -s /usr/sbin/ldirectord ldirectord
cd $(DTMP)/etc/ && ln -s ha.d heartbeat
+
+ # Binaries are not allowed in /etc
+ mv $(DTMP)/etc/ha.d/resource.d/IPv6addr $(DTMP)/usr/lib/heartbeat
+ cd $(DTMP)/etc/ha.d/resource.d/ && ln -s /usr/lib/heartbeat/IPv6addr .
+
dh_movefiles --source=debian/tmp
binary-indep: build install
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 36
********************************************
