Cleanup

diff --git a/bot.py b/bot.py
index d283db99ff338798409e5b9292b98d11447701d3..42644bc457b77e85ee7016404ff4ca9cfc2b3cc7 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -17,20 +17,12 @@ def main():
     xmpp = MUCBot(JID, PASS, ROOM, NICK)
     xmpp.register_bot_plugin(Feeds)
     xmpp.register_bot_plugin(Ping)
-    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
+    try:
+        xmpp.connect()
+        xmpp.process()
+    except KeyboardInterrupt:
         xmpp.shutdown_plugins()
-        xmpp.log.info('Done')
-    else:
-        xmpp.log.info('Unable to connect.')
+    xmpp.log.info('Done')
 
 # Script starts here
 if __name__ == '__main__':

diff --git a/sid/feeds.py b/sid/feeds.py
index 5a33d6d5ccb40dbaa2c1f88d3c5a1795d02e16aa..2cb0964646276bf0ec2e7c5529d18ecb99731b07 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -136,13 +136,11 @@ class Feeds(Plugin):
         # not working <http://bugs.debian.org/612274>
         # 'http://www.debian.org/News/news',
 
-        # DPN in french
-        'http://www.debian.org/News/weekly/dwn.fr.rdf',
+        # Some packages
+        'https://tracker.debian.org/pkg/prosody/rss',
+        'https://tracker.debian.org/pkg/ejabberd/rss',
 
         # Misc
-        'http://rss.gmane.org/topics/excerpts/gmane.linux.debian.devel.announce',
-        'http://rss.gmane.org/gmane.linux.debian.user.security.announce',
-        'http://planet-fr.debian.net/users/rss20.xml',
         'http://planet.debian.org/atom.xml',
         ]