[yum-commits] Branch 'yum-3_2_X' - 2 commits - docs/yum.8 yumcommands.py

[James Antill]

 docs/yum.8     |    6 ++++++
 yumcommands.py |    5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 21fe4ef6797c14af7e8b591feef1b9115226382d
Author: James Antill <james at and.org>
Date:   Mon Nov 16 13:54:47 2009 -0500

    Document --releasever

diff --git a/docs/yum.8 b/docs/yum.8
index 3e3355b..899cb99 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -350,6 +350,12 @@ Resolve depsolve problems by removing packages that are causing problems
 from the transaction.
 .br
 Configuration Option: \fBskip_broken\fP
+.br
+.IP "\fB\-\-releasever=version\fP"
+Pretend the current release version is the given string. This is very useful
+when combined with --installroot. Note that with the default upstream cachedir,
+of /var/cache/yum, using this option will corrupt your cache (and you can use
+$releasever in your cachedir configuration to stop this).
 .PP 
 .IP "\fB\-t, --tolerant\fP"
 This option currently does nothing.
commit 1934f8832dc22802913ce79eb45724f10d44edc8
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date:   Mon Nov 16 20:38:50 2009 +0200

    Fix UnicodeDecodeErrors in yumcommands.py
    
    Fix two UnicodeDecodeErrors which were raised when running 'yum -v
    repolist' in fi_FI.utf8 with the yet uncommitted Finnish translation.

diff --git a/yumcommands.py b/yumcommands.py
index c0504a6..d13f84a 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -23,6 +23,7 @@ import os
 import cli
 from yum import logginglevels
 from yum import _
+from yum import misc
 import yum.Errors
 import operator
 import locale
@@ -890,7 +891,7 @@ class RepoListCommand(YumCommand):
                         num = _("Instant (last: %s)") % last
                     else:
                         num = locale.format("%d", repo.metadata_expire, True)
-                        num = _("%s second(s) (last: %s)") % (num, last)
+                        num = _("%s second(s) (last: %s)") % (misc.to_unicode(num), last)
 
                     out += [base.fmtKeyValFill(_("Repo-expire  : "), num)]
 
@@ -904,7 +905,7 @@ class RepoListCommand(YumCommand):
 
                     base.verbose_logger.log(logginglevels.DEBUG_3,
                                             "%s\n",
-                                            "\n".join(out))
+                                            "\n".join(map(misc.to_unicode, out)))
 
         if not verbose and cols:
             #  Work out the first (id) and last (enabled/disalbed/count),