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

[James Antill]

 yum/__init__.py |    2 +-
 yummain.py      |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit d88286ca555fb23eae001ea507f0d558d1d90ad4
Author: James Antill <james at and.org>
Date:   Tue Jul 19 14:51:56 2011 -0400

    Output the yum_save file on assumeno and gpg sig. fails.

diff --git a/yummain.py b/yummain.py
index e17f1e3..d6abd70 100755
--- a/yummain.py
+++ b/yummain.py
@@ -238,9 +238,15 @@ def main(args):
         rpmdb_warn_checks()
         return_code = result
         if base._ts_save_file:
-            verbose_logger.info(_("Your transaction was saved, rerun it with: yum load-transaction %s") % base._ts_save_file)
+            verbose_logger.info(_("Your transaction was saved, rerun it with:\n yum load-transaction %s") % base._ts_save_file)
     elif return_code < 0:
         return_code = 1 # Means the pre-transaction checks failed...
+        #  This includes:
+        # . No packages.
+        # . Hitting N at the prompt.
+        # . GPG check failures.
+        if base._ts_save_file:
+            verbose_logger.info(_("Your transaction was saved, rerun it with:\n yum load-transaction %s") % base._ts_save_file)
     else:
         verbose_logger.log(logginglevels.INFO_2, _('Complete!'))
 
commit e43a302435ba967909200cc70f6e6ebf4bb8cbf2
Author: James Antill <james at and.org>
Date:   Tue Jul 19 14:51:27 2011 -0400

    Tidy up the yum_save file, so it is easier to read.

diff --git a/yum/__init__.py b/yum/__init__.py
index 12c2bdd..f97378c 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -5241,7 +5241,7 @@ class YumBase(depsolve.Depsolve):
             raise Errors.YumBaseError(_("Dependencies not solved. Will not save unresolved transaction."))
         
         if not filename:
-            prefix = 'yum_save_tx-%s' % time.strftime('%Y-%m-%d-%H-%M')
+            prefix = 'yum_save_tx.%s' % time.strftime('%Y-%m-%d.%H-%M.')
             fd,filename = tempfile.mkstemp(suffix='.yumtx', prefix=prefix)
             f = os.fdopen(fd, 'w')
         else: