[yum-cvs] /yum-utils repo-rss.py,1.4.2.3,1.4.2.4

[Tim Lauridsen]

Update of /home/groups/yum/cvs//yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv25475

Modified Files:
      Tag: yum-utils-1_0_X
	repo-rss.py 
Log Message:
Merged some fixes from HEAD

Index: repo-rss.py
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/repo-rss.py,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- repo-rss.py	20 Mar 2007 07:57:16 -0000	1.4.2.3
+++ repo-rss.py	19 Apr 2007 09:12:19 -0000	1.4.2.4
@@ -19,7 +19,7 @@
 import yum.Errors
 from yum.misc import getCacheDir
 from yum.comps import Comps, CompsException
-from repomd.mdErrors import RepoMDError
+from yum.Errors import RepoMDError
 import sys
 import os
 import libxml2
@@ -145,8 +145,8 @@
             changelog += '%s - %s\n%s\n\n' % (date, author, desc)
         description = '<p><strong>%s</strong> - %s</p>\n\n' % (escape(pkg.name), 
                                             escape(pkg.returnSimple('summary')))
-        description += '<p>%s</p>\n\n<p><strong>Change Log:</strong></p>\n\n' % escape(pkg.returnSimple('description').replace("\n", "<br />\n"))
-        description += escape('<pre>%s</pre>' % escape(changelog))
+        description += '<p>%s</p>\n\n<p><strong>Change Log:</strong></p>\n\n' % escape(pkg.returnSimple('description').encode('utf-8').replace("\n", "<br />\n"))
+        description += escape('<pre>%s</pre>' % escape(changelog.encode('utf-8')))
         item.newChild(None, 'description', description)
         
         return item