[yum-commits] debuginfo-install.py package-cleanup.py yum-builddep.py yum-complete-transaction.py

[skvidal at osuosl.org]

 debuginfo-install.py        |    9 ++++++++-
 package-cleanup.py          |   22 ++++++++++++++++++++--
 yum-builddep.py             |   10 +++++++++-
 yum-complete-transaction.py |   10 +++++++++-
 4 files changed, 46 insertions(+), 5 deletions(-)

New commits:
commit 95856a959b42d360b8931e0deadd6077e9419556
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jul 6 12:43:05 2010 -0400

    optionally call doUtilBuildTransaction(), if available for all the utils that need to do that

diff --git a/debuginfo-install.py b/debuginfo-install.py
index bc83b6b..0891f63 100755
--- a/debuginfo-install.py
+++ b/debuginfo-install.py
@@ -99,7 +99,14 @@ class DebugInfoInstall(YumUtilBase):
         self.doUtilYumSetup()
         
         self.debugInfo_main()
-        self.buildTransaction()
+        if hasattr(self, 'doUtilBuildTransaction'):
+            self.doUtilBuildTransaction()
+        else:
+            try:
+                self.buildTransaction()
+            except yum.Errors.YumBaseError, e:
+                self.logger.critical("Error building transaction: %s" % e)
+                sys.exit(1)
         if len(self.tsInfo) < 1:
             print 'No debuginfo packages available to install'
             self.doUnlock()
diff --git a/package-cleanup.py b/package-cleanup.py
index cce5c99..a788b34 100755
--- a/package-cleanup.py
+++ b/package-cleanup.py
@@ -342,7 +342,15 @@ class PackageCleanup(YumUtilBase):
                 
             self._remove_old_kernels(opts.kernelcount, opts.keepdevel)
             self.run_with_package_names.add('yum-utils')
-            self.buildTransaction()
+            if hasattr(self, 'doUtilBuildTransaction'):
+                self.doUtilBuildTransaction()
+            else:
+                try:
+                    self.buildTransaction()
+                except yum.Errors.YumBaseError, e:
+                    self.logger.critical("Error building transaction: %s" % e)
+                    sys.exit(1)
+
             if len(self.tsInfo) < 1:
                 print 'No old kernels to remove'
                 sys.exit(0)
@@ -382,7 +390,17 @@ class PackageCleanup(YumUtilBase):
                 self.conf.tsflags.append('noscripts')
             self._remove_old_dupes()
             self.run_with_package_names.add('yum-utils')
-            self.buildTransaction()
+
+            if hasattr(self, 'doUtilBuildTransaction'):
+                self.doUtilBuildTransaction()
+            else:
+                try:
+                    self.buildTransaction()
+                except yum.Errors.YumBaseError, e:
+                    self.logger.critical("Error building transaction: %s" % e)
+                    sys.exit(1)
+                                    
+
             if len(self.tsInfo) < 1:
                 print 'No duplicates to remove'
                 sys.exit(0)
diff --git a/yum-builddep.py b/yum-builddep.py
index 77aa542..657707b 100755
--- a/yum-builddep.py
+++ b/yum-builddep.py
@@ -96,7 +96,15 @@ class YumBuildDep(YumUtilBase):
             self.logger.error(msg)
             sys.exit(1)
 
-        self.buildTransaction()
+        if hasattr(self, 'doUtilBuildTransaction'):
+            self.doUtilBuildTransaction()
+        else:
+            try:
+                self.buildTransaction()
+            except yum.Errors.YumBaseError, e:
+                self.logger.critical("Error building transaction: %s" % e)
+                sys.exit(1)
+
         if len(self.tsInfo) < 1:
             print 'No uninstalled build requires'
             sys.exit()
diff --git a/yum-complete-transaction.py b/yum-complete-transaction.py
index 81731c9..fde1f35 100755
--- a/yum-complete-transaction.py
+++ b/yum-complete-transaction.py
@@ -207,7 +207,15 @@ class YumCompleteTransaction(YumUtilBase):
 
 
         current_count = len(self.tsInfo)
-        self.buildTransaction(unfinished_transactions_check=False)
+        if hasattr(self, 'doUtilBuildTransaction'):
+            self.doUtilBuildTransaction(unfinished_transactions_check=False)
+        else:
+            try:
+                self.buildTransaction(unfinished_transactions_check=False)
+            except yum.Errors.YumBaseError, e:
+                self.logger.critical("Error building transaction: %s" % e)
+                sys.exit(1)
+
         if current_count != len(self.tsInfo):
             print '\n\nTransaction size changed - this means we are not doing the\n' \
                   'same transaction as we were before. Aborting and disabling\n' \