[Pkg-bluetooth-commits] r929 - /packages/blueproximity/trunk/debian/patches/support-new-configobj.patch

[francesco-guest at users.alioth.debian.org]

Author: francesco-guest
Date: Mon Mar 29 10:24:26 2010
New Revision: 929

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=929
Log:
added the patch file under version control

Added:
    packages/blueproximity/trunk/debian/patches/support-new-configobj.patch

Added: packages/blueproximity/trunk/debian/patches/support-new-configobj.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/blueproximity/trunk/debian/patches/support-new-configobj.patch?rev=929&op=file
==============================================================================
--- packages/blueproximity/trunk/debian/patches/support-new-configobj.patch (added)
+++ packages/blueproximity/trunk/debian/patches/support-new-configobj.patch Mon Mar 29 10:24:26 2010
@@ -1,0 +1,30 @@
+diff -Nur -x '*.orig' -x '*~' blueproximity-1.2.5//proximity.py blueproximity-1.2.5.new//proximity.py
+--- blueproximity-1.2.5//proximity.py	2010-03-29 12:06:25.809480910 +0200
++++ blueproximity-1.2.5.new//proximity.py	2010-03-29 12:08:27.489105107 +0200
+@@ -377,7 +377,7 @@
+             pass
+         # then let's get it on...
+         # create the new config
+-        newconf = ConfigObj(self.config.dict())
++        newconf = ConfigObj(**self.config.dict())
+         newconf.filename = newname
+         # and save it to the new name
+         newconf.write()
+@@ -1257,7 +1257,7 @@
+         if filename.endswith('.conf'):
+             try:
+ 		# add every valid .conf file to the array of configs
+-                config = ConfigObj(os.path.join(conf_dir,filename),{'create_empty':False,'file_error':True,'configspec':conf_specs})
++                config = ConfigObj(os.path.join(conf_dir,filename),**{'create_empty':False,'file_error':True,'configspec':conf_specs})
+                 # first validate it
+                 config.validate(vdt, copy=True)
+                 # rewrite it in a secure manner
+@@ -1271,7 +1271,7 @@
+ 
+     # no previous configuration could be found so let's create a new one
+     if new_config:
+-        config = ConfigObj(os.path.join(conf_dir, _('standard') + '.conf'),{'create_empty':True,'file_error':False,'configspec':conf_specs})
++        config = ConfigObj(os.path.join(conf_dir, _('standard') + '.conf'),**{'create_empty':True,'file_error':False,'configspec':conf_specs})
+         # next line fixes a problem with creating empty strings in default values for configobj
+         config['device_mac'] = ''
+         config.validate(vdt, copy=True)