rpms/papyon/devel typeerror_b64decode.patch, NONE, 1.1 papyon.spec, 1.3, 1.4

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/papyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14945

Modified Files:
	papyon.spec 
Added Files:
	typeerror_b64decode.patch 
Log Message:
* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-2
- Add patch to fix a crasher with TypeError in b64decode.


typeerror_b64decode.patch:
 p2p.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE typeerror_b64decode.patch ---
Index: papyon-0.4.3/papyon/p2p.py
===================================================================
--- papyon-0.4.3.orig/papyon/p2p.py	2009-11-08 01:39:38.981813305 -0800
+++ papyon-0.4.3/papyon/p2p.py	2009-11-08 01:40:38.131141864 -0800
@@ -159,7 +159,10 @@
             shad = base64.b64decode(shad)
         shac = element.get("SHA1C", None)
         if shac is not None:
-            shac = base64.b64decode(shac)
+            try:
+                shac = base64.b64decode(shac)
+            except TypeError:
+                logger.warning("Invalid SHA1C in MSNObject")
 
         result = MSNObject(creator, size, type, location, friendly, shad, shac)
         result._repr = xml_data


Index: papyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/papyon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- papyon.spec	9 Oct 2009 19:30:12 -0000	1.3
+++ papyon.spec	29 Dec 2009 23:38:31 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           papyon
 Version:        0.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for MSN Messenger network
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Papyon
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		typeerror_b64decode.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,6 +33,7 @@ asynchronous manner
 
 %prep
 %setup -q
+%patch0 -p1 -b .b64decode
 %{__sed} -i 's|\#!/usr/bin/env python||' papyon/msnp2p/test.py
 
 
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-2
+- Add patch to fix a crasher with TypeError in b64decode.
+
 * Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-1
 - Update to 0.4.3.