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

[skvidal at osuosl.org]

 yum/__init__.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c76a066bfe113c4efc333751daf642d5ada43071
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Feb 14 15:35:35 2011 -0500

    name it 'saved_tx' so james doesn't misread it like an old man.

diff --git a/yum/__init__.py b/yum/__init__.py
index 143a07e..e395cc5 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1440,7 +1440,7 @@ class YumBase(depsolve.Depsolve):
             # write the saved transaction data to the addon location in history
             # so we can pull it back later if we need to
             savetx_msg = open(self._ts_save_file, 'r').read()
-            self.history.write_addon_data('txfile', savetx_msg)
+            self.history.write_addon_data('saved_tx', savetx_msg)
 
             try:
                 os.unlink(self._ts_save_file)
commit 2b05f38df2a22d61366926eb36eb2743dcb409b1
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Feb 14 12:54:30 2011 -0500

    store our yum saved transaction file content to the the history addon data for this transaction.

diff --git a/yum/__init__.py b/yum/__init__.py
index c160201..143a07e 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1435,9 +1435,13 @@ class YumBase(depsolve.Depsolve):
         # will be we store what we thought, not what happened (so it'll be an
         # invalid cache).
         self.rpmdb.transactionResultVersion(frpmdbv)
-
         # transaction has started - all bets are off on our saved ts file
         if self._ts_save_file is not None:
+            # write the saved transaction data to the addon location in history
+            # so we can pull it back later if we need to
+            savetx_msg = open(self._ts_save_file, 'r').read()
+            self.history.write_addon_data('txfile', savetx_msg)
+
             try:
                 os.unlink(self._ts_save_file)
             except (IOError, OSError), e: