Hello community, here is the log from the commit of package pacemaker-pygui for openSUSE:Factory checked in at Thu Dec 4 18:07:09 CET 2008. -------- --- pacemaker-pygui/pacemaker-pygui.changes 2008-11-06 22:41:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/pacemaker-pygui/pacemaker-pygui.changes 2008-12-04 14:21:04.000000000 +0100 @@ -1,2 +1 @@ -------------------------------------------------------------------- -Thu Nov 6 22:41:04 CET 2008 - ro@suse.de +Thu Dec 4 20:25:35 CST 2008 - xwhu@suse.de @@ -4 +3,5 @@ -- added directories to filelist to fix build +- bnc#455988, GUI should only add provider for ocf resources +- bnc#456380, GUI segfault on wrong DISPLAY setting +- Add support for transition graph +- GUI for node local openais configuration +- Enable snmp agent for pacemaker on openais @@ -7,3 +9,0 @@ -Thu Nov 6 22:29:36 CET 2008 - ro@suse.de - -- package name set to pacemaker-pygui @@ -11,2 +11 @@ -------------------------------------------------------------------- -Sat Sep 13 07:15:55 CET 2008 - xwhu@suse.de +Sat Sep 13 07:15:55 CEST 2008 - xwhu@suse.de @@ -15,0 +15 @@ +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- cluster_report.diff pacemaker-starter.glade pacemaker_starter.py quit_on_display_error.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker-pygui.spec ++++++ --- /var/tmp/diff_new_pack.q32663/_old 2008-12-04 18:06:04.000000000 +0100 +++ /var/tmp/diff_new_pack.q32663/_new 2008-12-04 18:06:04.000000000 +0100 @@ -30,14 +30,18 @@ Name: pacemaker-pygui Summary: Management Tools for Pacemaker based HA solution Version: 1.4 -Release: 3 +Release: 4 License: GPL v2 or later Url: http://hg.clusterlabs.org/pacemaker/pygui Group: Productivity/Clustering/HA Source: pygui.tar.bz2 +Source1: pacemaker_starter.py +Source2: pacemaker-starter.glade +Patch0: cluster_report.diff +Patch1: quit_on_display_error.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -Requires: pyxml +Requires: pyxml graphviz-python BuildRequires: heartbeat-devel libheartbeat-devel libopenais-devel libpacemaker-devel BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libxml2-devel ncurses-devel pam-devel python-devel swig BuildRequires: net-snmp-devel @@ -100,6 +104,8 @@ %prep ########################################################### %setup -n pygui +%patch0 -p1 +%patch1 -p1 ########################################################### %build @@ -155,6 +161,11 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/heartbeat-gui +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/heartbeat-gui +pushd $RPM_BUILD_ROOT/usr/bin +ln -sf ../share/heartbeat-gui/pacemaker_starter.py pacemaker_starter +popd # Cleanup [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool @@ -187,7 +198,7 @@ %files devel %defattr(-,root,root) -%dir %{_includedir}/heartbeat/mgmt +%{_includedir}/heartbeat/mgmt %{_includedir}/heartbeat/mgmt/mgmt.h %{_includedir}/heartbeat/mgmt/mgmt_client.h %{_includedir}/heartbeat/mgmt/mgmt_common.h @@ -200,7 +211,8 @@ %dir %{_libdir}/heartbeat %{_sysconfdir}/pam.d/hbmgmtd %{_bindir}/hb_gui -%dir %{_libdir}/heartbeat-gui +%{_bindir}/pacemaker_starter +%{_libdir}/heartbeat-gui %{_libdir}/heartbeat-gui/haclient.py %{_libdir}/heartbeat-gui/pymgmt.py %{_libdir}/heartbeat/mgmtd @@ -210,20 +222,21 @@ %{_libdir}/libhbmgmtcommon.so* %{_libdir}/libhbmgmttls.so* %{_libdir}/heartbeat-gui/_pymgmt.so* -#%{_libdir}/heartbeat/hbagent -%dir %{_datadir}/heartbeat-gui +%{_libdir}/heartbeat/hbagent +%{_datadir}/heartbeat-gui %{_datadir}/heartbeat-gui/*.png -%{_datadir}/heartbeat-gui/haclient.glade -%{_datadir}/heartbeat-gui/haclient.py -%{_datadir}/heartbeat-gui/mgmtcmd.py +%{_datadir}/heartbeat-gui/*.glade +%{_datadir}/heartbeat-gui/*.py %{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo %{_datadir}/snmp/mibs/LINUX-HA-MIB.mib -#%{_datadir}/heartbeat/SNMPAgentSanityCheck +%{_datadir}/heartbeat/SNMPAgentSanityCheck %changelog -* Thu Nov 06 2008 ro@suse.de -- added directories to filelist to fix build -* Thu Nov 06 2008 ro@suse.de -- package name set to pacemaker-pygui -* Sat Sep 13 2008 xwhu@suse.de +* Thu Dec 04 2008 xwhu@suse.de +- bnc#455988, GUI should only add provider for ocf resources +- bnc#456380, GUI segfault on wrong DISPLAY setting +- Add support for transition graph +- GUI for node local openais configuration +- Enable snmp agent for pacemaker on openais +* Fri Sep 12 2008 xwhu@suse.de - First checking ++++++ cluster_report.diff ++++++ Index: pygui/mgmt/daemon/mgmt_crm.c =================================================================== --- pygui.orig/mgmt/daemon/mgmt_crm.c 2008-12-03 16:24:14.000000000 +0800 +++ pygui/mgmt/daemon/mgmt_crm.c 2008-12-04 11:39:40.000000000 +0800 @@ -3209,7 +3209,7 @@ } } - snprintf(cmd, sizeof(cmd), "hb_report -DC %s %s", buf, dest); + snprintf(cmd, sizeof(cmd), "hb_report -ADC %s %s", buf, dest); mgmt_log(LOG_INFO, "cluster_report: %s", cmd); if (system(cmd) < 0) { mgmt_log(LOG_ERR, "error on system %s: %s", @@ -3217,9 +3217,10 @@ free(dest); return strdup(MSG_FAIL); } + mgmt_log(LOG_INFO, "cluster_report: Run hb_report successfully"); - snprintf(filename, sizeof(filename), "%s.tar.gz", dest); - snprintf(cmd, sizeof(cmd), "base64 %s", filename); + snprintf(filename, sizeof(filename), "%s.tar.bz2", dest); + snprintf(cmd, sizeof(cmd), "/usr/bin/base64 %s", filename); if ((fstream = popen(cmd, "r")) == NULL) { mgmt_log(LOG_ERR, "error on popen %s: %s", cmd, strerror(errno)); @@ -3243,6 +3244,7 @@ if (pclose(fstream) == -1) mgmt_log(LOG_WARNING, "failed to close pipe"); + mgmt_log(LOG_INFO, "cluster_report: send out"); unlink(filename); free(dest); return ret; Index: pygui/mgmt/client/haclient.py.in =================================================================== --- pygui.orig/mgmt/client/haclient.py.in 2008-12-03 16:24:14.000000000 +0800 +++ pygui/mgmt/client/haclient.py.in 2008-12-04 11:43:04.000000000 +0800 @@ -6097,7 +6097,7 @@ save_dir = os.path.dirname(save_file) try : - current_tarfile = tarfile.open(save_file, "r:gz") + current_tarfile = tarfile.open(save_file, "r:bz2") except IOError, msg : msgbox(_("I/O error: ") + str(msg)) return @@ -6158,7 +6158,7 @@ des_f.close() try : - new_tarfile = tarfile.open(save_file, "w:gz") + new_tarfile = tarfile.open(save_file, "w:bz2") except IOError, msg : msgbox(_("I/O error: ") + str(msg)) self.delete_files(save_dir, file_list) @@ -6171,12 +6171,12 @@ current_arcname = os.path.commonprefix(file_list).split(os.sep)[0] if current_arcname != '' : file_basename = os.path.basename(save_file) - if save_file.endswith(".tar.gz") : - new_arcname = file_basename[:file_basename.rfind(".tar.gz")] - elif save_file.endswith(".tgz") : - new_arcname = file_basename[:file_basename.rfind(".tgz")] - elif save_file.endswith(".gz") : - new_arcname = file_basename[:file_basename.rfind(".gz")] + if save_file.endswith(".tar.bz2") : + new_arcname = file_basename[:file_basename.rfind(".tar.bz2")] + elif save_file.endswith(".tbz") : + new_arcname = file_basename[:file_basename.rfind(".tbz")] + elif save_file.endswith(".bz2") : + new_arcname = file_basename[:file_basename.rfind(".bz2")] else : new_arcname = file_basename ++++++ pacemaker-starter.glade ++++++ ++++ 846 lines (skipped) ++++++ pacemaker_starter.py ++++++ ++++ 685 lines (skipped) ++++++ pygui.tar.bz2 ++++++ ++++ 2526 lines of diff (skipped) ++++++ quit_on_display_error.diff ++++++ Index: pygui/mgmt/client/haclient.py.in =================================================================== --- pygui.orig/mgmt/client/haclient.py.in 2008-12-04 21:06:08.000000000 +0800 +++ pygui/mgmt/client/haclient.py.in 2008-12-04 21:09:57.000000000 +0800 @@ -9441,6 +9441,11 @@ return desc if __name__ == '__main__' : + try: + gtk._gtk.init_check() + except RuntimeError: + print "Can't open display" + sys.exit() if not pygtk_newer(2, 4) : print "the pygtk 2.4 or newer is needed." sys.exit() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org