[febootstrap] Include upstream patch to work around Python stupidity.

[Richard W.M. Jones]

commit e52dfc55ab7ec1a2e735442ceeaab952bc0cc1f3
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Nov 9 22:21:38 2011 +0000

    Include upstream patch to work around Python stupidity.

 ...code-when-_bestPackageFromList-returns-No.patch |   27 ++++++++++++++++++++
 febootstrap.spec                                   |   10 ++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch b/0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch
new file mode 100644
index 0000000..d88afd2
--- /dev/null
+++ b/0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch
@@ -0,0 +1,27 @@
+From 61c565bc06a83da75b57f8568fe76f393e665d70 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Tue, 8 Nov 2011 14:40:18 +0000
+Subject: [PATCH] Fix Python code when _bestPackageFromList returns None.
+
+Yet Another Bug caused by lack of strong typing and nullable types in
+this sad excuse for a programming language.
+---
+ src/febootstrap_yum_rpm.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/febootstrap_yum_rpm.ml b/src/febootstrap_yum_rpm.ml
+index bfda11e..1def619 100644
+--- a/src/febootstrap_yum_rpm.ml
++++ b/src/febootstrap_yum_rpm.ml
+@@ -78,7 +78,7 @@ while not stable:
+             for r in pkg.requires:
+                 ps = yb.whatProvides (r[0], r[1], r[2])
+                 best = yb._bestPackageFromList (ps.returnPackages ())
+-                if best.name != pkg.name:
++                if best and best.name != pkg.name:
+                     deps[pkg].append (best)
+                     if not deps.has_key (best):
+                         deps[best] = False
+-- 
+1.7.6
+
diff --git a/febootstrap.spec b/febootstrap.spec
index c0ceb32..3951d1a 100644
--- a/febootstrap.spec
+++ b/febootstrap.spec
@@ -1,13 +1,16 @@
 Summary:     Bootstrapping tool for creating supermin appliances
 Name:        febootstrap
 Version:     3.12
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://people.redhat.com/~rjones/febootstrap/
 Source0:     http://people.redhat.com/~rjones/febootstrap/files/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
+# Upstream patch to workaround Python stupidity.
+Patch0:      0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch
+
 BuildRequires: /usr/bin/pod2man
 BuildRequires: yum >= 3.2
 BuildRequires: /sbin/mke2fs
@@ -52,6 +55,8 @@ Obsoletes:   febootstrap <= 3.3-3
 %prep
 %setup -q
 
+%patch0 -p1
+
 
 %build
 %configure
@@ -89,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov  9 2011 Richard Jones <rjones at redhat.com> - 3.12-2
+- Include upstream patch to work around Python stupidity.
+
 * Tue Oct 18 2011 Richard Jones <rjones at redhat.com> - 3.12-1
 - New upstream version 3.12.
 - Remove upstream patch which is included in this version.