[yum-git] 2 commits - cli.py yum/comps.py

[James Antill]

 cli.py       |    4 ++--
 yum/comps.py |   10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 3609504373f13acec2765749cea3763c85535e76
Author: James Antill <james at and.org>
Date:   Sat Apr 19 19:17:29 2008 -0400

    Sort grouplist

diff --git a/cli.py b/cli.py
index 9d093c1..af1bfba 100644
--- a/cli.py
+++ b/cli.py
@@ -809,14 +809,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         if len(installed) > 0:
             self.verbose_logger.log(yum.logginglevels.INFO_2,
                 _('Installed Groups:'))
-            for group in installed:
+            for group in sorted(installed, key=lambda x: x.nameByLang(mylang)):
                 self.verbose_logger.log(yum.logginglevels.INFO_2, '   %s',
                     group.nameByLang(mylang))
         
         if len(available) > 0:
             self.verbose_logger.log(yum.logginglevels.INFO_2,
                 _('Available Groups:'))
-            for group in available:
+            for group in sorted(available, key=lambda x: x.nameByLang(mylang)):
                 self.verbose_logger.log(yum.logginglevels.INFO_2, '   %s',
                     group.nameByLang(mylang))
 
commit 68d27bd254094d3a08dd6195358aabd4c7537901
Author: James Antill <james at and.org>
Date:   Sat Apr 19 19:15:32 2008 -0400

    Fix grouplist for fr_FR etc.

diff --git a/yum/comps.py b/yum/comps.py
index f9b94ed..d00ef39 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -24,6 +24,8 @@ from Errors import CompsException
 #FIXME - compsexception isn't caught ANYWHERE so it's pointless to raise it
 # switch all compsexceptions to grouperrors after api break
 
+from yum.misc import to_unicode
+
 lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'
 
 def parse_boolean(strng):
@@ -91,16 +93,16 @@ class Group(object):
 
         for langcode in self._expand_languages(lang):
             if self.translated_name.has_key(langcode):
-                return self.translated_name[langcode]
+                return to_unicode(self.translated_name[langcode])
 
-        return self.name
+        return to_unicode(self.name)
 
 
     def descriptionByLang(self, lang):
         for langcode in self._expand_languages(lang):
             if self.translated_description.has_key(langcode):
-                return self.translated_description[langcode]
-        return self.description
+                return to_unicode(self.translated_description[langcode])
+        return to_unicode(self.description)
 
     def parse(self, elem):
         for child in elem: