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

[skvidal at osuosl.org]

 output.py      |    2 +-
 yum/rpmsack.py |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 9b9e3c12ea4479248c175059186c0710159e4df8
Merge: 05c000a... 7034819...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Apr 1 15:59:33 2009 -0400

    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:
      Cleanup old directories, when we delete the last attribute
      Fix delete for cached attrs

commit 05c000aa174fd6a657c8d1e0774198f474abbb93
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Apr 1 15:58:48 2009 -0400

    - remove unnecessary yumdb_info check
    - add back todo for sync_with_rpmdb

diff --git a/output.py b/output.py
index 198bd10..d902177 100755
--- a/output.py
+++ b/output.py
@@ -470,7 +470,7 @@ class YumOutput:
         na = '%s%s.%s' % (indent, pkg.name, pkg.arch)
         hi_cols = [highlight, 'normal', 'normal']
         rid = pkg.repoid
-        if hasattr(pkg, 'yumdb_info') and 'repoid' in pkg.yumdb_info:
+        if 'repoid' in pkg.yumdb_info:
             rid = '@' + pkg.yumdb_info.repoid
         columns = zip((na, ver, rid), columns, hi_cols)
         print self.fmtColumns(columns)
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 52d9e6c..e825418 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -695,6 +695,12 @@ class RPMDBAdditionalData(object):
     def sync_with_rpmdb(self, rpmdbobj):
         """populate out the dirs and remove all the items no longer in the rpmd
            and/or populate various bits to the currently installed version"""
+        # TODO:
+        # get list of all items in the yumdb
+        # remove any no longer in the rpmdb/andor migrate them up to the currently
+        # installed version
+        # add entries for items in the rpmdb if they don't exist in the yumdb
+
         pass
 
 class RPMDBAdditionalDataPackage(object):