Package: svnmailer
Version: 1.0.8-12
Severity: important
Tags: wheezy
Hi,
svnmailer has an instance of #683188 and needs to be updated to work with
pysubversion from wheezy. This affects svn repositories on alioth since the
ugprade to wheezy. The attached patch fixes it. It would be great to get an
update in p-u so we can get it fixed in alioth.
Arguably pysubversion should export svn_core.SVN_STREAM_CHUNK_SIZE as an int and
not a long type since it expects an int in svn_stream_* calls. But I don't know
if that would break other things so this patch should be safe.
Cheers,
Emilio
pochu@vasks:/svn/pkg-gnome/hooks$ /usr/bin/svn-mailer --commit --config
/svn/pkg-gnome/hooks/svnmailer.conf --repository /svn/pkg-gnome --revision 38594
One or more notifiers crashed. You may want to send the following traceback(s)
to the author:
------------------------------------------------------------------------------
Notifier: svnmailer.util.URLTruncatingDecorator
Revision: 38594
Groups: [u'bysource']
Traceback (most recent call last):
File "/usr/lib/pymodules/python2.7/svnmailer/main.py", line 101, in run
notifier.run()
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_mail.py", line 62, in
run
for mail in self.getMails():
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_mail.py", line 83, in
getMails
for mail in self.composeMail():
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_textmail.py", line 131,
in composeMail
self.writeNotification()
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_textmail.py", line 379,
in writeNotification
self.__super.writeNotification()
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_mail.py", line 96, in
writeNotification
self.writeDiffList()
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_textmail.py", line 414,
in writeDiffList
self.__super.writeDiffList()
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_text.py", line 183, in
writeDiffList
self.writeContentDiff(change)
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_textmail.py", line 419,
in writeContentDiff
self.__super.writeContentDiff(change)
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_text.py", line 352, in
writeContentDiff
change, enc = enc, default = default
File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_base.py", line 320, in
dumpContent
fp, change.getBasePath(), change.getBaseRevision()
File "/usr/lib/pymodules/python2.7/svnmailer/subversion.py", line 358, in
dumpPathContent
stream, svn_core.SVN_STREAM_CHUNK_SIZE
File "/usr/lib/pymodules/python2.7/libsvn/core.py", line 4801, in
svn_stream_read
return _core.svn_stream_read(*args)
TypeError: expecting an integer for the buffer size
diff -ruNp svnmailer-1.0.8.orig/src/lib/svnmailer/subversion.py svnmailer-1.0.8/src/lib/svnmailer/subversion.py
--- svnmailer-1.0.8.orig/src/lib/svnmailer/subversion.py 2006-04-17 12:29:06.000000000 +0200
+++ svnmailer-1.0.8/src/lib/svnmailer/subversion.py 2013-06-15 16:07:36.137576163 +0200
@@ -355,7 +355,7 @@ class Repository(object):
try:
while True:
chunk = svn_core.svn_stream_read(
- stream, svn_core.SVN_STREAM_CHUNK_SIZE
+ stream, int(svn_core.SVN_STREAM_CHUNK_SIZE)
)
if not chunk:
break
