[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

Julien 'Ainulindale' Cassignol ainulindale at gmail.com
Mon Feb 2 18:51:52 UTC 2009


The following commit has been merged in the master branch:
commit af588df3e736bba19a6744e29fa3527946ebb4e7
Author: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>
Date:   Thu Jan 8 19:17:17 2009 +0100

    Corrected a trailing \n causing problems with the writing of the contacts backend.

diff --git a/framework/subsystems/opimd/pimb_csv_contacts.py b/framework/subsystems/opimd/pimb_csv_contacts.py
index 31c48fe..ac61bab 100644
--- a/framework/subsystems/opimd/pimb_csv_contacts.py
+++ b/framework/subsystems/opimd/pimb_csv_contacts.py
@@ -85,10 +85,11 @@ class CSVContactBackend(Backend):
             
             for line in file:
                 if line.find('=') == -1: continue
-                
+                in_line = line.strip()
+
                 # Break CSV line up into key/value pairs, then assign them to the new entry
                 entry = {}
-                pairs = line.split(',')
+                pairs = in_line.split(',')
                 for pair in pairs:
                     (key, value) = pair.split('=')
                     entry[key] = value

-- 
FSO frameworkd Debian packaging



More information about the pkg-fso-commits mailing list