Attachment 914946 Details for Bug 1116544 – patch to fix "dnf repolist all"

[patch] patch to fix "dnf repolist all"

__init__.py.patch (text/plain), 6.75 KB, created by Takayuki Ogawa on 2014-07-06 11:00:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takayuki Ogawa

Created: 2014-07-06 11:00:03 UTC

Size: 6.75 KB

patch

obsolete

>*** /usr/lib/python2.7/site-packages/dnf/cli/commands/__init__.py.bak	2014-05-28 17:27:24.000000000 +0900
>--- /usr/lib/python2.7/site-packages/dnf/cli/commands/__init__.py	2014-07-06 15:39:11.854168286 +0900
>***************
>*** 24,30 ****
>  from __future__ import print_function
>  from __future__ import unicode_literals
>  from dnf.cli.format import format_number
>! from dnf.i18n import _, ucd, fill_exact_width
>  
>  import dnf.cli
>  import dnf.const
>--- 24,30 ----
>  from __future__ import print_function
>  from __future__ import unicode_literals
>  from dnf.cli.format import format_number
>! from dnf.i18n import _, ucd, exact_width, fill_exact_width
>  
>  import dnf.cli
>  import dnf.const
>***************
>*** 557,563 ****
>                      continue
>                  if force_show or verbose:
>                      ui_enabled = ehibeg + _('enabled') + hiend
>!                     ui_endis_wid = len(_('enabled'))
>                      if not verbose:
>                          ui_enabled += ": "
>                          ui_endis_wid += 2
>--- 557,563 ----
>                      continue
>                  if force_show or verbose:
>                      ui_enabled = ehibeg + _('enabled') + hiend
>!                     ui_endis_wid = exact_width(_('enabled'))
>                      if not verbose:
>                          ui_enabled += ": "
>                          ui_endis_wid += 2
>***************
>*** 576,582 ****
>                  elif arg == 'enabled' and not force_show:
>                      continue
>                  ui_enabled = dhibeg + _('disabled') + hiend
>!                 ui_endis_wid = len(_('disabled'))
>  
>              if not verbose:
>                  rid = repo.id
>--- 576,582 ----
>                  elif arg == 'enabled' and not force_show:
>                      continue
>                  ui_enabled = dhibeg + _('disabled') + hiend
>!                 ui_endis_wid = exact_width(_('disabled'))
>  
>              if not verbose:
>                  rid = repo.id
>***************
>*** 668,692 ****
>          if not verbose and cols:
>              #  Work out the first (id) and last (enabled/disalbed/count),
>              # then chop the middle (name)...
>!             id_len = len(_('repo id'))
>              nm_len = 0
>              st_len = 0
>              ui_len = 0
>  
>              for (rid, rname, (ui_enabled, ui_endis_wid), ui_num) in cols:
>!                 if id_len < len(rid):
>!                     id_len = len(rid)
>!                 if nm_len < len(rname):
>!                     nm_len = len(rname)
>!                 if st_len < (ui_endis_wid + len(ui_num)):
>!                     st_len = (ui_endis_wid + len(ui_num))
>                  # Need this as well as above for: utf8_width_fill()
>!                 if ui_len < len(ui_num):
>!                     ui_len = len(ui_num)
>              if arg == 'disabled': # Don't output a status column.
>                  left = self.output.term.columns - (id_len + 1)
>!             elif len(_('status')) > st_len:
>!                 left = self.output.term.columns - (id_len + len(_('status')) +2)
>              else:
>                  left = self.output.term.columns - (id_len + st_len + 2)
>  
>--- 668,692 ----
>          if not verbose and cols:
>              #  Work out the first (id) and last (enabled/disalbed/count),
>              # then chop the middle (name)...
>!             id_len = exact_width(_('repo id'))
>              nm_len = 0
>              st_len = 0
>              ui_len = 0
>  
>              for (rid, rname, (ui_enabled, ui_endis_wid), ui_num) in cols:
>!                 if id_len < exact_width(rid):
>!                     id_len = exact_width(rid)
>!                 if nm_len < exact_width(rname):
>!                     nm_len = exact_width(rname)
>!                 if st_len < (ui_endis_wid + exact_width(ui_num)):
>!                     st_len = (ui_endis_wid + exact_width(ui_num))
>                  # Need this as well as above for: utf8_width_fill()
>!                 if ui_len < exact_width(ui_num):
>!                     ui_len = exact_width(ui_num)
>              if arg == 'disabled': # Don't output a status column.
>                  left = self.output.term.columns - (id_len + 1)
>!             elif exact_width(_('status')) > st_len:
>!                 left = self.output.term.columns - (id_len + exact_width(_('status')) +2)
>              else:
>                  left = self.output.term.columns - (id_len + st_len + 2)
>  
>***************
>*** 697,703 ****
>                  id_len += left // 2
>                  nm_len += left - (left // 2)
>  
>!             txt_rid = "%-*s" % (id_len, _('repo id'))
>              txt_rnam = fill_exact_width(_('repo name'), nm_len)
>              if arg == 'disabled': # Don't output a status column.
>                  self.base.logger.info("%s %s",
>--- 697,703 ----
>                  id_len += left // 2
>                  nm_len += left - (left // 2)
>  
>!             txt_rid = fill_exact_width(_('repo id'), id_len, discard_over_width=False)
>              txt_rnam = fill_exact_width(_('repo name'), nm_len)
>              if arg == 'disabled': # Don't output a status column.
>                  self.base.logger.info("%s %s",
>***************
>*** 708,721 ****
>              for (rid, rname, (ui_enabled, ui_endis_wid), ui_num) in cols:
>                  if arg == 'disabled': # Don't output a status column.
>                      self.base.logger.info("%s %s",
>!                                           "%-*s" % (id_len, rid),
>                                            fill_exact_width(rname, nm_len))
>                      continue
>  
>                  if ui_num:
>!                     ui_num = "%*s" % (ui_len, ui_num)
>                  self.base.logger.info("%s %s %s%s",
>!                                       "%-*s" % (id_len, rid),
>                                        fill_exact_width(rname, nm_len),
>                                        ui_enabled, ui_num)
>          msg = 'repolist: %s' % ucd(locale.format("%d", tot_num, True))
>--- 708,721 ----
>              for (rid, rname, (ui_enabled, ui_endis_wid), ui_num) in cols:
>                  if arg == 'disabled': # Don't output a status column.
>                      self.base.logger.info("%s %s",
>!                                           fill_exact_width(rid, id_len, discard_over_width=False),
>                                            fill_exact_width(rname, nm_len))
>                      continue
>  
>                  if ui_num:
>!                     ui_num = fill_exact_width(ui_num, ui_len, discard_over_width=False, padding_left=True)
>                  self.base.logger.info("%s %s %s%s",
>!                                       fill_exact_width(rid, id_len, discard_over_width=False),
>                                        fill_exact_width(rname, nm_len),
>                                        ui_enabled, ui_num)
>          msg = 'repolist: %s' % ucd(locale.format("%d", tot_num, True))

Actions: View | Diff

Attachments on bug 1116544: 914946 | 914947 | 914948 | 914953