[yum-commits] 2 commits - yum/history.py

[James Antill]

 yum/history.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b6b871dc5c886c585fdd56a6c0c51c17a7fc3501
Merge: 2216e1a f1d11a3
Author: James Antill <james at and.org>
Date:   Thu Dec 1 15:16:55 2011 -0500

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum: (9 commits)
      Remove trailing [lang] from group completions.
      ...

commit 2216e1a8d352718e92ebb14ff57f9635d960c29c
Author: James Antill <james at and.org>
Date:   Thu Dec 1 13:09:29 2011 -0500

    Fix _conv_pkg_state when calling with history as checksum. BZ 757736.

diff --git a/yum/history.py b/yum/history.py
index d27fa44..0a29059 100644
--- a/yum/history.py
+++ b/yum/history.py
@@ -426,7 +426,7 @@ class YumMergedHistoryTransaction(YumHistoryTransaction):
     def _conv_pkg_state(pkg, state):
         npkg = YumHistoryPackageState(pkg.name, pkg.arch,
                                       pkg.epoch,pkg.version,pkg.release, state,
-                                      pkg._history)
+                                      history=pkg._history)
         npkg._checksums = pkg._checksums
         npkg.done = pkg.done
         if _sttxt2stcode[npkg.state] in TS_INSTALL_STATES: