backend/server/importlib/packageImport.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit a7e2877841f4ac5bc47c28ba0320deb496f3408a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:56:56 2011 +0200
We need to specifically check for None when calling decode.
Addressing
File
"/usr/lib/python2.6/site-packages/spacewalk/server/importlib/importLib.py", line
623, in run
self.preprocess()
File
"/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py",
line 58, in preprocess
self._processPackage(package)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py",
line 275, in _processPackage
package['description'] =
self._fix_encoding(package['description'])
File
"/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py",
line 506, in _fix_encoding
return text.decode('utf8')
AttributeError: 'NoneType' object has no attribute 'decode'
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index 7432d1d..d01cf86 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -502,6 +502,8 @@ class PackageImport(ChannelPackageSubscription):
package['checksum_type'],
package['checksum'])
def _fix_encoding(self, text):
+ if text is None:
+ return None
try:
return text.decode('utf8')
except UnicodeDecodeError:
Show replies by date