From bc71732e368b28a96538b96e12fa80d383d8dfec Mon Sep 17 00:00:00 2001
From: cedricbonhomme <devnull@localhost>
Date: Wed, 5 Jan 2011 08:11:45 +0100
Subject: Minor bug fix when removing a feed from the data base.

---
 pyAggr3g470r.py | 8 ++++----
 var/feed.lst    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index b7a19d34..ebe58a8a 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -944,11 +944,11 @@ class Root:
         html = htmlheader()
         html += htmlnav
         html += """<div class="left inner">"""
-        if feed in self.feeds.values():
-            utils.remove_feed(feed.feed_link)
+        try:
+            utils.remove_feed(self.feeds[feed_id].feed_link)
             html += """<p>All articles from the feed <i>%s</i> are now removed from the base.</p><br />""" % \
-                (feed.feed_title,)
-        else:
+                (self.feeds[feed_id].feed_title,)
+        except:
             return self.error_page("This feed do not exists.")
         html += """<a href="/management/">Back to the management page.</a><br />\n"""
         html += "<hr />\n"
diff --git a/var/feed.lst b/var/feed.lst
index bf742b68..2288b2b7 100755
--- a/var/feed.lst
+++ b/var/feed.lst
@@ -1,7 +1,7 @@
 http://feeds2.feedburner.com/diveintomark/all
 http://www.foo.be/cgi-bin/wiki.pl?action=journal&tile=AdulauMessyDesk
 http://blog.cedricbonhomme.org/feed/
-http://blog.bnjgat.fr/index.php?feed/rss2
+http://bnjgat.fr/blog/?feed/atom
 http://standblog.org/blog/feed/atom
 http://www.haypocalc.com/blog/rss.php
 http://linuxfr.org/backend/news-homepage/rss20.rss
-- 
cgit