Hello community,

here is the log from the commit of package d-feet for openSUSE:Factory
checked in at Thu Aug 18 10:27:15 CEST 2011.



--------
--- d-feet/d-feet.changes       2010-12-20 10:31:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/d-feet/d-feet.changes  2011-08-18 
09:21:04.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 12 06:10:37 UTC 2011 - [email protected]
+
+- bugfix for bgo#644701: can't start the d-feet after the previous start
+- when using python2.7,d-feet configuration failed
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  bugfix_python27_not_start.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ d-feet.spec ++++++
--- /var/tmp/diff_new_pack.gKPecE/_old  2011-08-18 10:20:09.000000000 +0200
+++ /var/tmp/diff_new_pack.gKPecE/_new  2011-08-18 10:20:09.000000000 +0200
@@ -20,7 +20,7 @@
 
 Name:           d-feet
 Version:        0.1.12
-Release:        1
+Release:        6
 Summary:        Graphical D-Bus Debugger
 Group:          Development/Tools/Debuggers
 License:        GPLv2+
@@ -33,6 +33,7 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  update-desktop-files
 Requires:       python-gtk
+Patch0:         bugfix_python27_not_start.patch
 BuildArch:      noarch
 %py_requires
 
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"

++++++ bugfix_python27_not_start.patch ++++++
Index: d-feet-0.1.12/dfeet/settings.py
===================================================================
--- d-feet-0.1.12.orig/dfeet/settings.py
+++ d-feet-0.1.12/dfeet/settings.py
@@ -7,6 +7,7 @@
    
 import ConfigParser
 import os
+import sys
 
 class Settings:
     """
@@ -31,6 +32,10 @@ class Settings:
             filename -- path to the settings file.
                         If None, the default ~/.dfeet/config will be used.
         """
+        if sys.version_info[:2]==(2,7):
+            self.version2_7=True
+        else:
+            self.version2_7=False
         if not filename:
             self.filename = os.path.expanduser("~/.d-feet/config")
         else:
@@ -71,6 +76,8 @@ class Settings:
         for key in self.general:
             if key.endswith('list'):
                 self.general[key] = ','.join(self.general[key])
+            if self.general[key] == None and self.version2_7:
+                self.general[key] = ''
                   
             self.config.set("General", key, self.general[key])
             

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to