[yum-commits] Branch 'yum-3_2_X' - yum/depsolve.py

[Panu Matilainen]

 yum/depsolve.py |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 2449edf63c7c7c6e2d346cffa16a0006727b2362
Author: Panu Matilainen <pmatilai at laiskiainen.org>
Date:   Thu Feb 24 10:22:41 2011 +0200

    Revert "Don't keep full headers in memory during transaction"
    
    This reverts commit 3302369486dc07edc2428c616ed2b8843562f615.
    The callback key isn't as contained within the callback classes
    as I'd hoped, various places are testing isinstance(h, rpm.hdr) etc.
    Since changing the callback style is an incompatible change, it needs
    to be an opt-in feature enabled by callers who are ready for it. And
    since its going to be incompatible, we can do better than copy data
    around.

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 997c66d..3aaba0e 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -220,12 +220,8 @@ class Depsolve(object):
                         txmbr.ts_state = 'i'
                         txmbr.output_state = TS_INSTALL
 
-                # grab essential data for callback use in hdr-like form
-                minhdr = {}
-                for item in ['epoch', 'name', 'version', 'release', 'arch']:
-                    minhdr[item] = hdr[item]
                 
-                self.ts.addInstall(hdr, (minhdr, rpmfile), txmbr.ts_state)
+                self.ts.addInstall(hdr, (hdr, rpmfile), txmbr.ts_state)
                 self.verbose_logger.log(logginglevels.DEBUG_1,
                     _('Adding Package %s in mode %s'), txmbr.po, txmbr.ts_state)
                 if self.dsCallback: