Changeset 514 for yum/vendor/current/shell.py

Timestamp:

Feb 3, 2015, 8:28:05 AM (11 years ago)

Author:

Yuri Dario

Message:

yum: initial vendor import of yum 3.4.3.

File:

• yum/vendor/current/shell.py (modified) (5 diffs)

yum/vendor/current/shell.py

@@ +1 @@
+#! /usr/bin/python -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -51 +52 @@
         self.verbose_logger = logging.getLogger("yum.verbose.cli")
 
+        # NOTE: This is shared with self.base ... so don't reassign.
+        self._shell_history_cmds = []
+
+    def _shell_history_add_cmds(self, cmds):
+        if not self.base.conf.history_record:
+            return
+
+        self._shell_history_cmds.append(cmds)
 
     def _shlex_split(self, input_string):
@@ -98 +107 @@
             self.base.cmds = self._shlex_split(self.base.cmdstring)
             self.base.plugins.run('args', args=self.base.cmds)
+
+            self._shell_history_add_cmds(self.base.cmds)
 
             try:
@@ -266 +277 @@
             cmds.insert(0, 'repolist')
             self.base.cmds = cmds
+
+            self._shell_history_add_cmds(self.base.cmds)
 
             try:
@@ -343 +356 @@
                     self.logger.critical('\n\nExiting on Broken Pipe')
             else:
-                if returnval not in [0,1]:
+                if returnval not in [0,1,-1]:
                     self.verbose_logger.info('Transaction encountered a serious error.')
                 else:
                     if returnval == 1:
                         self.verbose_logger.info('There were non-fatal errors in the transaction')
+                    elif returnval == -1:
+                        self.verbose_logger.info("Transaction didn't start")
                     self.verbose_logger.log(logginglevels.INFO_2,
                         'Finished Transaction')