tools/queue_rss.py: bump version and wrap to 79 columns

[dak.git] / tools / queue_rss.py

diff --git a/tools/queue_rss.py b/tools/queue_rss.py
index 4c1b45866cde3a5832a871c41bd734d81a85fbcf..9fcc1d8db5e8e0aa8f3c7807f051e4978ff5cd78 100755 (executable)
--- a/tools/queue_rss.py
+++ b/tools/queue_rss.py
@@ -3,8 +3,9 @@
 
 # License: GPL v2 or later
 # Author: Filippo Giunchedi <filippo@debian.org>
-# Version: 0.4
+# Version: 0.5
 
+import cgi
 import os
 import os.path
 import cPickle
@@ -22,7 +23,8 @@ outrss_filename = "NEW_out.rss"
 db_filename = "status.db"
 
 parser = OptionParser()
-parser.set_defaults(queuedir="queue", outdir="out", datadir="status", max_entries="30")
+parser.set_defaults(queuedir="queue", outdir="out", datadir="status",
+                    max_entries="30")
 
 parser.add_option("-q", "--queuedir", dest="queuedir",
         help="The queue dir (%default)")
@@ -110,16 +112,20 @@ def add_rss_item(status, msg, direction):
         return False
 
     description = "<pre>Description: %s\nChanges: %s\n</pre>" % \
-            (utf2ascii(msg['Description']), utf2ascii(msg['Changes']))
+            (utf2ascii(cgi.escape(msg['Description'])),
+             utf2ascii(cgi.escape(msg['Changes'])))
+
+    link = "http://ftp-master.debian.org/new/%s_%s.html" % \
+            (msg['Source'], msg['Version'])
 
     feed.items.insert(0,
         PyRSS2Gen.RSSItem(
             title,
             pubDate = pubdate,
             description = description,
-            author = utf2ascii(msg['Maintainer']),
-            link = "http://ftp-master.debian.org/new/%s_%s.html" % \
-                    (msg['Source'], msg['Version'])
+            author = utf2ascii(cgi.escape(msg['Maintainer'])),
+            link = link,
+            guid = link
         )
     )