[SM-Commit] GIT changes to master grimoire by Eric Sandall (d7344f93a5df0aae8daf7fceae0f040df36f2be8)

Eric Sandall scm at sourcemage.org
Thu Sep 16 17:08:28 EDT 2010


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 utils/virt-manager/HISTORY    |    4 ++++
 utils/virt-manager/PRE_BUILD  |    4 ++++
 utils/virt-manager/py27.patch |   13 +++++++++++++
 3 files changed, 21 insertions(+)

New commits:
commit d7344f93a5df0aae8daf7fceae0f040df36f2be8
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    virt-manager: Fix segfault with Python 2.7
    
    Based on gajim's Python 2.7 patch (thanks Vlad!)

diff --git a/utils/virt-manager/HISTORY b/utils/virt-manager/HISTORY
index 44dbd8a..ac2816e 100644
--- a/utils/virt-manager/HISTORY
+++ b/utils/virt-manager/HISTORY
@@ -1,3 +1,7 @@
+2010-09-16 Eric Sandall <sandalle at sourcemage.org>
+	* PRE_BUILD: Apply py27.patch
+	* py27.patch: Based on gajim's Python 2.7 patch (thanks Vlad!)
+
 2010-09-04 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 0.8.5
 
diff --git a/utils/virt-manager/PRE_BUILD b/utils/virt-manager/PRE_BUILD
new file mode 100755
index 0000000..9feb67c
--- /dev/null
+++ b/utils/virt-manager/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Fix segfault with Python 2.7...${DEFAULT_COLOR}" &&
+patch $SOURCE_DIRECTORY/src/virt-manager.py.in \
+      $SPELL_DIRECTORY/py27.patch
diff --git a/utils/virt-manager/py27.patch b/utils/virt-manager/py27.patch
new file mode 100644
index 0000000..d6ffd3f
--- /dev/null
+++ b/utils/virt-manager/py27.patch
@@ -0,0 +1,13 @@
+diff -Naur virt-manager-0.8.5.orig/src/virt-manager.py.in virt-manager-0.8.5/src/virt-manager.py.in
+--- virt-manager-0.8.5.orig/src/virt-manager.py.in	2010-09-16 14:01:40.384000000 -0700
++++ virt-manager-0.8.5/src/virt-manager.py.in	2010-09-16 14:05:57.497999779 -0700
+@@ -278,7 +278,8 @@
+     # on as if all were fine. Ultimately bad stuff happens,
+     # so lets catch it here & get the hell out...
+     import warnings
+-    warnings.filterwarnings('error', module='gtk')
++    #Don't segfault with Python 2.7
++    #warnings.filterwarnings('error', module='gtk')
+     try:
+         import gobject
+ 



More information about the SM-Commit mailing list