[yum-commits] Branch 'yum-3_2_X' - 2 commits - output.py yum/__init__.py yumcommands.py

[James Antill]

 output.py       |   16 ++++++++--------
 yum/__init__.py |    1 +
 yumcommands.py  |    4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 42c4e0ee64a0cd0fa61ae478fdc351204e427f31
Author: James Antill <james at and.org>
Date:   Fri May 1 15:56:58 2009 -0400

    Rename yumdb.repoid to yumdb.from_repo

diff --git a/output.py b/output.py
index 4cf8734..ba1d002 100755
--- a/output.py
+++ b/output.py
@@ -472,8 +472,8 @@ class YumOutput:
         na = '%s%s.%s' % (indent, pkg.name, pkg.arch)
         hi_cols = [highlight, 'normal', 'normal']
         rid = pkg.repoid
-        if pkg.repoid == 'installed' and 'repoid' in pkg.yumdb_info:
-            rid = '@' + pkg.yumdb_info.repoid
+        if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
+            rid = '@' + pkg.yumdb_info.from_repo
         columns = zip((na, ver, rid), columns, hi_cols)
         print self.fmtColumns(columns)
 
@@ -487,8 +487,8 @@ class YumOutput:
         envra = '%s%s' % (indent, str(pkg))
         hi_cols = [highlight, 'normal', 'normal']
         rid = pkg.repoid
-        if pkg.repoid == 'installed' and 'repoid' in pkg.yumdb_info:
-            rid = '@' + pkg.yumdb_info.repoid
+        if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
+            rid = '@' + pkg.yumdb_info.from_repo
         columns = zip((envra, rid), columns, hi_cols)
         print self.fmtColumns(columns)
 
@@ -541,8 +541,8 @@ class YumOutput:
         print _("Release    : %s") % to_unicode(pkg.release)
         print _("Size       : %s") % self.format_number(float(pkg.size))
         print _("Repo       : %s") % to_unicode(pkg.repoid)
-        if pkg.repoid == 'installed' and 'repoid' in pkg.yumdb_info:
-            print _("From repo  : %s") % to_unicode(pkg.yumdb_info.repoid)
+        if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
+            print _("From repo  : %s") % to_unicode(pkg.yumdb_info.from_repo)
         if self.verbose_logger.isEnabledFor(logginglevels.DEBUG_3):
             print _("Committer  : %s") % to_unicode(pkg.committer)
             print _("Committime : %s") % time.ctime(pkg.committime)
@@ -686,8 +686,8 @@ class YumOutput:
             for (apkg, ipkg) in pkg_names2pkgs[item]:
                 pkg = ipkg or apkg
                 envra = utf8_width(str(pkg)) + utf8_width(indent)
-                if pkg.repoid == 'installed' and 'repoid' in pkg.yumdb_info:
-                    rid = len(pkg.yumdb_info.repoid) + 1
+                if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
+                    rid = len(pkg.yumdb_info.from_repo) + 1
                 else:
                     rid   = len(pkg.repoid)
                 for (d, v) in (('envra', envra), ('rid', rid)):
diff --git a/yumcommands.py b/yumcommands.py
index 3fe0e02..9d34055 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -207,8 +207,8 @@ def _add_pkg_simple_list_lens(data, pkg, indent=''):
         This "knows" about simpleList and printVer. """
     na  = len(pkg.name)    + 1 + len(pkg.arch)    + len(indent)
     ver = len(pkg.version) + 1 + len(pkg.release)
-    if pkg.repoid == 'installed' and 'repoid' in pkg.yumdb_info:
-        rid = len(pkg.yumdb_info.repoid) + 1
+    if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
+        rid = len(pkg.yumdb_info.from_repo) + 1
     else:
         rid = len(pkg.repoid)
     if pkg.epoch != '0':
commit f303c23022dc60808fdd380618bdcb8501c91aaf
Author: James Antill <james at and.org>
Date:   Fri May 1 15:54:32 2009 -0400

    Add releasever to yumdb

diff --git a/yum/__init__.py b/yum/__init__.py
index 1aab227..dc80da2 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1018,6 +1018,7 @@ class YumBase(depsolve.Depsolve):
                 po = self.rpmdb.searchPkgTuple(txmbr.pkgtup)[0]
                 po.yumdb_info.from_repo = txmbr.po.repoid
                 po.yumdb_info.reason = txmbr.reason
+                po.yumdb_info.releasever = self.yumvar['releasever']
                 if hasattr(self, 'cmds') and self.cmds:
                     po.yumdb_info.command_line = ' '.join(self.cmds)