[yum-utils] Fix for BuildTrans no return value checking, needed for mock. Resolves: bug#716267

[James Antill]

commit 1509339c521101653b5a32054952b01d9d26176c
Author: James Antill <james at and.org>
Date:   Thu Jul 28 12:26:35 2011 -0400

    Fix for BuildTrans no return value checking, needed for mock.
    Resolves: bug#716267

 BZ-716267-BuildTrans-ret-check.patch |   77 ++++++++++++++++++++++++++++++++++
 yum-utils.spec                       |    9 ++++-
 2 files changed, 85 insertions(+), 1 deletions(-)
---
diff --git a/BZ-716267-BuildTrans-ret-check.patch b/BZ-716267-BuildTrans-ret-check.patch
new file mode 100644
index 0000000..76ce631
--- /dev/null
+++ b/BZ-716267-BuildTrans-ret-check.patch
@@ -0,0 +1,77 @@
+commit 32ec6213b9f698eb48c573b16e8bae40eb7dca8c
+Author: Ville Skyttä <ville.skytta at iki.fi>
+Date:   Fri Jun 24 18:44:32 2011 +0300
+
+    Check doUtilBuildTransaction return value, exit early on failure.  BZ 716267
+
+diff --git a/debuginfo-install.py b/debuginfo-install.py
+index 0891f63..177c6c3 100755
+--- a/debuginfo-install.py
++++ b/debuginfo-install.py
+@@ -100,7 +100,9 @@ class DebugInfoInstall(YumUtilBase):
+         
+         self.debugInfo_main()
+         if hasattr(self, 'doUtilBuildTransaction'):
+-            self.doUtilBuildTransaction()
++            errc = self.doUtilBuildTransaction()
++            if errc:
++                sys.exit(errc)
+         else:
+             try:
+                 self.buildTransaction()
+diff --git a/package-cleanup.py b/package-cleanup.py
+index a4eb7d9..4794369 100755
+--- a/package-cleanup.py
++++ b/package-cleanup.py
+@@ -343,7 +343,9 @@ class PackageCleanup(YumUtilBase):
+             self._remove_old_kernels(opts.kernelcount, opts.keepdevel)
+             self.run_with_package_names.add('yum-utils')
+             if hasattr(self, 'doUtilBuildTransaction'):
+-                self.doUtilBuildTransaction()
++                errc = self.doUtilBuildTransaction()
++                if errc:
++                    sys.exit(errc)
+             else:
+                 try:
+                     self.buildTransaction()
+@@ -392,7 +394,9 @@ class PackageCleanup(YumUtilBase):
+             self.run_with_package_names.add('yum-utils')
+ 
+             if hasattr(self, 'doUtilBuildTransaction'):
+-                self.doUtilBuildTransaction()
++                errc = self.doUtilBuildTransaction()
++                if errc:
++                    sys.exit(errc)
+             else:
+                 try:
+                     self.buildTransaction()
+diff --git a/yum-builddep.py b/yum-builddep.py
+index d13c90e..d7a37c3 100755
+--- a/yum-builddep.py
++++ b/yum-builddep.py
+@@ -98,7 +98,9 @@ class YumBuildDep(YumUtilBase):
+             sys.exit(1)
+ 
+         if hasattr(self, 'doUtilBuildTransaction'):
+-            self.doUtilBuildTransaction()
++            errc = self.doUtilBuildTransaction()
++            if errc:
++                sys.exit(errc)
+         else:
+             try:
+                 self.buildTransaction()
+diff --git a/yum-complete-transaction.py b/yum-complete-transaction.py
+index fde1f35..c5074ab 100755
+--- a/yum-complete-transaction.py
++++ b/yum-complete-transaction.py
+@@ -208,7 +208,9 @@ class YumCompleteTransaction(YumUtilBase):
+ 
+         current_count = len(self.tsInfo)
+         if hasattr(self, 'doUtilBuildTransaction'):
+-            self.doUtilBuildTransaction(unfinished_transactions_check=False)
++            errc = self.doUtilBuildTransaction(unfinished_transactions_check=False)
++            if errc:
++                sys.exit(errc)
+         else:
+             try:
+                 self.buildTransaction(unfinished_transactions_check=False)
diff --git a/yum-utils.spec b/yum-utils.spec
index 8140259..5c72848 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -3,11 +3,12 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.30
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
 URL: http://yum.baseurl.org/download/yum-utils/
+Patch0: BZ-716267-BuildTrans-ret-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: yum >= 3.2.29
@@ -369,6 +370,8 @@ need rebooting, or have updates, etc.)
 %prep
 %setup -q
 
+%patch0 -p1
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -655,6 +658,10 @@ fi
 /usr/lib/yum-plugins/ps.*
 
 %changelog
+* Thu Jul 28 2011 James Antill <james at fedoraproject.org>
+- Fix for BuildTrans no return value checking, needed for mock.
+- Resolves: bug#716267
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild