[yum/f15] Fix for pulp using the repostorage API. Fix for progress ctrl-m on yum update.

[James Antill]

commit 8f197b29bb5bad2427c1c5f2013fca1ea8573122
Author: James Antill <james at and.org>
Date:   Wed Aug 17 15:06:48 2011 -0400

    Fix for pulp using the repostorage API.
    Fix for progress ctrl-m on yum update.

 BZ-720088-progress-ctrl-m-fix.patch |   18 ++++++++++++++++++
 pulp-repostorage-fix.patch          |   24 ++++++++++++++++++++++++
 yum.spec                            |   10 +++++++++-
 3 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/BZ-720088-progress-ctrl-m-fix.patch b/BZ-720088-progress-ctrl-m-fix.patch
new file mode 100644
index 0000000..60e3afd
--- /dev/null
+++ b/BZ-720088-progress-ctrl-m-fix.patch
@@ -0,0 +1,18 @@
+commit fce611847370974d131ec50a4eb689ae462c20c0
+Author: Zdeněk Pavlas <zpavlas at redhat.com>
+Date:   Mon Jul 11 10:33:48 2011 +0200
+
+    Do not output '\r' unless to a tty. BZ 720088
+
+diff --git a/output.py b/output.py
+index b6aa277..94cbc64 100755
+--- a/output.py
++++ b/output.py
+@@ -2366,6 +2366,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
+         
+         if self.output and (sys.stdout.isatty() or te_current == te_total):
+             (fmt, wid1, wid2) = self._makefmt(percent, ts_current, ts_total,
++                                              progress=sys.stdout.isatty(),
+                                               pkgname=pkgname, wid1=wid1)
+             msg = fmt % (utf8_width_fill(process, wid1, wid1),
+                          utf8_width_fill(pkgname, wid2, wid2))
diff --git a/pulp-repostorage-fix.patch b/pulp-repostorage-fix.patch
new file mode 100644
index 0000000..146d0e7
--- /dev/null
+++ b/pulp-repostorage-fix.patch
@@ -0,0 +1,24 @@
+commit 3d7c28d4ec579b97e30b75364d4662ec360d70ca
+Author: James Antill <james at and.org>
+Date:   Thu Jun 2 10:28:50 2011 -0400
+
+    Fix for pulp directly using RepoStorage() without a YumBase().
+
+diff --git a/yum/repos.py b/yum/repos.py
+index 4ea4961..3793bad 100644
+--- a/yum/repos.py
++++ b/yum/repos.py
+@@ -110,7 +110,12 @@ class RepoStorage:
+             repoobj.quick_enable_disable = self.quick_enable_disable
+         else:
+             self._cache_enabled_repos = None
+-        repoobj._override_sigchecks = self.ayum._override_sigchecks
++        #  At least pulp reuses RepoStorage but doesn't have a "real" YumBase()
++        # so we can't guarantee new YumBase() attrs. exist.
++        if not hasattr(self.ayum, '_override_sigchecks'):
++            repoobj._override_sigchecks = False
++        else:
++            repoobj._override_sigchecks = self.ayum._override_sigchecks
+ 
+     def delete(self, repoid):
+         if repoid in self.repos:
diff --git a/yum.spec b/yum.spec
index 2a0c578..6a56869 100644
--- a/yum.spec
+++ b/yum.spec
@@ -7,7 +7,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.2.29
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -24,6 +24,8 @@ Patch6: yum-HEAD.patch
 Patch8: skip-broken-rel-eng.patch
 Patch9: BZ-701744-collapse-libc.patch
 Patch10: yum-createrepo-sqlite-update-fixes.patch
+Patch11: pulp-repostorage-fix.patch
+Patch12: BZ-720088-progress-ctrl-m-fix.patch
 
 Patch20: yum-manpage-files.patch
 
@@ -133,6 +135,8 @@ Install this package if you want auto yum updates nightly via cron.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 %patch20 -p1
 
 %build
@@ -256,6 +260,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Wed Aug 17 2011 James Antill <james at fedoraproject.org> - 3.2.29-9
+- Fix for pulp using the repostorage API.
+- Fix for progress ctrl-m on yum update.
+
 * Thu Jul 28 2011 James Antill <james at fedoraproject.org> - 3.2.29-8
 - Fix for createrepo sqlite update.
 - Also doesn't auto load summary/description/url/sourcerpm.