Potential strengthing of feed file writing on UNIX

Handle via links with no title attribute

diff --git a/rss2email.py b/rss2email.py
index d178bad30f159bb5d2e4787d2f4828ce3d5b6d2a..0dc2d04b3521a886f2e324e5a38e69e896c09fee 100644 (file)
--- a/rss2email.py
+++ b/rss2email.py
@@ -507,7 +507,11 @@ def unlock(feeds, feedfileObject):
        if not unix: 
                pickle.dump(feeds, open(feedfile, 'w'))
        else:   
-               pickle.dump(feeds, open(feedfile+'.tmp', 'w'))
+               fd = open(feedfile+'.tmp', 'w')
+               pickle.dump(feeds, fd)
+               fd.flush()
+               os.fsync(fd.fileno())
+               fd.close()
                os.rename(feedfile+'.tmp', feedfile)
                fcntl.flock(feedfileObject.fileno(), fcntl.LOCK_UN)
 
@@ -731,7 +735,10 @@ def run(num=None):
                                                                if ('rel' in extralink) and extralink['rel'] == u'via':
                                                                        extraurl = extralink['href']
                                                                        extraurl = extraurl.replace('http://www.google.com/reader/public/atom/', 'http://www.google.com/reader/view/')
-                                                                       content += '<br/>Via: <a href="'+extraurl+'">'+extralink['title']+'</a>\n'
+                                                                       viatitle = extraurl
+                                                                       if ('title' in extralink):
+                                                                           viatitle = extralink['title']
+                                                                       content += '<br/>Via: <a href="'+extraurl+'">'+viatitle+'</a>\n'
                                                content += '</p></div>\n'
                                                content += "\n\n</body></html>"
                                        else: