ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=16

Browse Source
This commit is contained in:
OBS User unknown 2009-02-17 20:59:31 +00:00 committed by Git OBS Bridge
parent f7fbefc50b
commit 8b0c94b6d4
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ocfs2-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 16 17:19:52 CET 2009 - coyli@suse.de
- ocfs2console: Whoops, don't reset all warnings, just pop the DISPLAY one.
Thanks to Hu Ziming from IBM and Joel Becker from Oracle.
-------------------------------------------------------------------
Tue Feb 10 10:07:36 CET 2009 - coyli@suse.de

7
ocfs2-tools.spec
View File

@ -22,7 +22,7 @@ Name: ocfs2-tools
BuildRequires: e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools
Version: 1.4.1
Release: 14
Release: 16
License: GPL v2 or later
Group: System/Filesystems
Source: ocfs2-tools.tar.bz2
@ -34,6 +34,7 @@ Patch100: ocfs2-quota.diff
Patch101: change-quotafile-names.diff
Patch102: ocfs2_controld-pacemaker.diff
Patch103: ocfs2console-extraoption-fix.diff
Patch104: ocfs2console-pop-display-warning.diff
Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq
@ -100,6 +101,7 @@ Authors:
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@ -206,6 +208,9 @@ fi
%{_libdir}/pkgconfig/ocfs2.pc
%changelog
* Mon Feb 16 2009 coyli@suse.de
- ocfs2console: Whoops, don't reset all warnings, just pop the DISPLAY one.
Thanks to Hu Ziming from IBM and Joel Becker from Oracle.
* Tue Feb 10 2009 coyli@suse.de
- ocfs2console: remove unsupported option when calling tunefs.ocfs2 (bnc#472353)
* Mon Feb 09 2009 abeekhof@suse.de

33
ocfs2console-pop-display-warning.diff Normal file
View File

@ -0,0 +1,33 @@
From: Coly Li <coly.li@suse.de>
Subject: ocfs2console: Whoops, don't reset all warnings, just pop the DISPLAY one
References: bnc#448523
Author: Hu Ziming <huzim@cn.ibm.com>
comment from patch by Joel:
We turn warnings into error while calling 'import gtk' to handle a pygtk
bug with an invalid DISPLAY. After we return from 'import gtk', we were
calling warnings.resetwarnings() to get back to the normal state.
However, it looks like that clears more warning filters than the one we
added. Let's fix this.
comment from bugzilla by Joel:
Ziming Hu's patch for fixing the warning filters is now upstream. I regret to
say that since I hand-coded it from memory, I forgot to credit him with the
discovery before committing. That credit will live here.
Signed-off-by: Hu Ziming <huzim@cn.ibm.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Coly Li <coly.li@suse.de>
---
diff -ru ocfs2-tools/ocfs2console/ocfs2console ocfs2-tools-new/ocfs2console/ocfs2console
--- ocfs2-tools/ocfs2console/ocfs2console 2009-02-17 06:06:57.910766000 +0100
+++ ocfs2-tools-new/ocfs2console/ocfs2console 2009-02-17 06:09:32.935591000 +0100
@@ -17,8 +17,7 @@
print >>sys.stderr, '''ERROR: ocfs2console needs an X11 display.
Make sure a proper setup for your display environment exists.\n'''
sys.exit(1)
-
-warnings.resetwarnings()
+warnings.filters.pop(0)
if nodeconf:
from ocfs2interface.nodeconfig import node_config