From 017b6928cf1f8f15591dc366c48ee73a441253cc Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Feb 17 2011 22:46:51 +0000
Subject: rpmUtils.miscutils recursive import, temporary patch


---

diff --git a/rpmutils-recursive-import.patch b/rpmutils-recursive-import.patch
new file mode 100644
index 0000000..b9cae20
--- /dev/null
+++ b/rpmutils-recursive-import.patch
@@ -0,0 +1,21 @@
+diff --git a/rpmUtils/transaction.py b/rpmUtils/transaction.py
+index c5167d3..61d7ec0 100644
+--- a/rpmUtils/transaction.py
++++ b/rpmUtils/transaction.py
+@@ -13,7 +13,6 @@
+ 
+ import rpm
+ import miscutils
+-from yum.i18n import to_str
+ 
+ read_ts = None
+ ts = None
+@@ -56,7 +55,7 @@ class TransactionWrapper:
+             #  Newer rpm (4.8.0+) has problem objects, older have just strings.
+             #  Should probably move to using the new objects, when we can. For
+             # now just be compatible.
+-            results.append(to_str(prob))
++            results.append(str(prob))
+ 
+         return results
+ 
diff --git a/yum.spec b/yum.spec
index 2b06bd0..79e3a82 100644
--- a/yum.spec
+++ b/yum.spec
@@ -7,7 +7,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.2.29
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -19,7 +19,7 @@ Patch3: yum-multilib-policy-best.patch
 Patch4: no-more-exactarchlist.patch
 Patch5: geode-arch.patch
 Patch6: yum-HEAD.patch
-
+Patch7: rpmutils-recursive-import.patch
 Patch20: yum-manpage-files.patch
 
 URL: http://yum.baseurl.org/
@@ -124,6 +124,7 @@ Install this package if you want auto yum updates nightly via cron.
 %patch4 -p0
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch20 -p1
 
 %build
@@ -247,6 +248,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Thu Feb 17 2011 Seth Vidal <skvidal at fedoraproject.org> - 3.2.29-6
+- add rpmutils-recursive-import.patch to work around recursive import problems
+
 * Wed Feb 16 2011 Seth Vidal <skvidal at fedoraproject.org> - 3.2.29-5
 - lots of hopefully NOT exciting changes to rpmutils/rpmsack from head.