[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/packages.py

[skvidal at osuosl.org]

 yum/packages.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e4b74afc5f804196367e04dcadca572b961ff38f
Merge: cdc15c4... bf276cc...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Feb 5 16:51:13 2009 -0500

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Fix circular reference due to bound YumBase instance method
      Add test for leaking YumBase objects
      Move some output out of -v, -d 6 to -d 7
      Show groupid in verbose mode of groupinfo

commit cdc15c45a2ae13f7a974ee81679c9d0027b8f3c9
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Feb 5 16:50:06 2009 -0500

    add some to_unicodes() for summary and description for not entirely clear reasons to
    make mergerepo not break on some pkgs

diff --git a/yum/packages.py b/yum/packages.py
index 4a2b759..2a5985f 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -802,8 +802,9 @@ class YumAvailablePackage(PackageObject, RpmBase):
   <time file="%s" build="%s"/>
   <size package="%s" installed="%s" archive="%s"/>\n""" % (self.name, 
          self.arch, self.epoch, self.ver, self.rel, csum_type, csum, 
-         misc.to_xml(self.summary), misc.to_xml(self.description), 
-         misc.to_xml(packager), misc.to_xml(url), self.filetime, 
+         misc.to_unicode(misc.to_xml(self.summary)), 
+         misc.to_unicode(misc.to_xml(self.description)), 
+         packager, url, self.filetime, 
          self.buildtime, self.packagesize, self.size, self.archivesize)
         
         msg += self._return_remote_location()