[mash] Fix crash.

Bill Nottingham notting at fedoraproject.org
Wed Jul 25 20:07:39 UTC 2012


commit 9b19b214a093757a9f0ff739f022ea0bd3358a72
Author: Bill Nottingham <notting at redhat.com>
Date:   Wed Jul 25 16:06:25 2012 -0400

    Fix crash.

 7da2983.patch |   18 ++++++++++++++++++
 mash.spec     |    7 ++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/7da2983.patch b/7da2983.patch
new file mode 100644
index 0000000..84511ba
--- /dev/null
+++ b/7da2983.patch
@@ -0,0 +1,18 @@
+commit 7da2983ec779413e2735731fbba28dde6be064d9 (HEAD, origin/master, origin/HEAD, master)
+Author: Bill Nottingham <notting at redhat.com>
+Date:   Wed Jul 25 16:05:14 2012 -0400
+
+    Fix crash (#843092)
+
+diff --git a/mash/multilib.py b/mash/multilib.py
+index 8688810..830b3ad 100644
+--- a/mash/multilib.py
++++ b/mash/multilib.py
+@@ -172,6 +172,7 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
+     def select(self, po):
+         blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel', 'php-devel', 'java-1.6.0-openjdk-devel',
+                      'java-1.7.0-openjdk-devel' ]
++        whitelist = []
+         if po.name in blacklist:
+             return False
+         if po.name in whitelist:
diff --git a/mash.spec b/mash.spec
index 9ee938b..1386915 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.29
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
@@ -13,6 +13,7 @@ Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch1:		7da2983.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -21,6 +22,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Wed Jul 25 2012 Bill Nottingham <notting at redhat.com> 0.5.29-2
+- fix whitelist (#843092)
+
 * Tue Jul 24 2012 Bill Nottingham <notting at redhat.com> 0.5.29-1
 - ship -static packages as multilib (#837901)
 


More information about the scm-commits mailing list