[Python-apps-team] Bug#680298: svnmailer does not work in wheezy/sid environment and exits with error

[Tomas Martisius]

Package: svnmailer
Version: 1.0.8-12
Severity: important
Tags: patch

Dear Maintainer,

svnmailer exits with this error in wheezy/sid environment:

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 compo
    self.writeNotification()
  File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_mail.py", line 96,
in writeNotif
    self.writeDiffList()
  File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_text.py", line 183,
in writeDiff
    self.writeContentDiff(change)
  File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_text.py", line 352,
in writeCont
    change, enc = enc, default = default
  File "/usr/lib/pymodules/python2.7/svnmailer/notifier/_base.py", line 320,
in dumpConte
    fp, change.getBasePath(), change.getBaseRevision()
  File "/usr/lib/pymodules/python2.7/svnmailer/subversion.py", line 358, in
dumpPathConte
    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

The some error is thrown using new upstream svnmailer version: 1.0.9.
This patch solves the problem, but I am not shure it is correct from
program logic view:

--- svnmailer-1.0.9/src/lib/svnmailer/subversion.py<--->2012-07-03
--- 21:50:35.824161158 +030
+++ svnmailer-1.0.9.new/src/lib/svnmailer/subversion.py>2012-07-03
21:50:31.464161328 +030
@@ -358,7 +358,7 @@                                                                       
             try:                                                                         
                 while True:                                                              
                     chunk = svn_core.svn_stream_read(                                    
-                        stream, svn_core.SVN_STREAM_CHUNK_SIZE                           
+                        stream, 16384                                                    
                     )                                                                    
                     if not chunk:                                                        
                         break      

Best regards,

Tomas Martišius


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages svnmailer depends on:
ii  python             2.7.3~rc2-1
ii  python-subversion  1.6.17dfsg-4
ii  python-support     1.0.14

svnmailer recommends no packages.

svnmailer suggests no packages.

-- no debconf information