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

James Antill james at osuosl.org
Tue Jun 29 15:09:40 UTC 2010


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

New commits:
commit 5c61137e1259c2df13f3945729920a84fdaf14e6
Author: James Antill <james at and.org>
Date:   Tue Jun 29 10:20:14 2010 -0400

    Fix the not possible yet, edge case slots deadlock.

diff --git a/yum/plugins.py b/yum/plugins.py
index a71c10f..77b38cf 100644
--- a/yum/plugins.py
+++ b/yum/plugins.py
@@ -99,7 +99,7 @@ SLOT_TO_CONDUIT = {
     }
 
 # Enumerate all slot names
-SLOTS = SLOT_TO_CONDUIT.keys()
+SLOTS = sorted(SLOT_TO_CONDUIT.keys())
 
 class PluginYumExit(Exception):
     '''Used by plugins to signal that yum should stop
commit 82a071f26cf7c985fb098213acc2dcedb70de27c
Author: James Antill <james at and.org>
Date:   Tue Jun 29 10:16:56 2010 -0400

    Save the full args. (including options) for the cmdline data.

diff --git a/yum/__init__.py b/yum/__init__.py
index 54f24f2..108a27c 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1322,7 +1322,9 @@ class YumBase(depsolve.Depsolve):
                 rpmdb_problems = self._rpmdb_warn_checks(warn=output_warn,
                                                         ignore_pkgs=ignore_pkgs)
             cmdline = None
-            if hasattr(self, 'cmds') and self.cmds:
+            if hasattr(self, 'args') and self.args:
+                cmdline = ' '.join(self.args)
+            elif hasattr(self, 'cmds') and self.cmds:
                 cmdline = ' '.join(self.cmds)
             self.history.beg(rpmdbv, using_pkgs, list(self.tsInfo),
                              self.skipped_packages, rpmdb_problems, cmdline)
@@ -1412,7 +1414,9 @@ class YumBase(depsolve.Depsolve):
                 po.yumdb_info.from_repo = rpo.repoid
                 po.yumdb_info.reason = txmbr.reason
                 po.yumdb_info.releasever = self.conf.yumvar['releasever']
-                if hasattr(self, 'cmds') and self.cmds:
+                if hasattr(self, 'args') and self.args:
+                    po.yumdb_info.command_line = ' '.join(self.args)
+                elif hasattr(self, 'cmds') and self.cmds:
                     po.yumdb_info.command_line = ' '.join(self.cmds)
                 csum = rpo.returnIdSum()
                 if csum is not None:


More information about the Yum-commits mailing list