[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: mailer.py now should work on Windows

From: Mark Therieau <markt_at_covergence.com>
Date: 2005-01-23 22:25:07 CET

Norbert Unterberg <nepo <at> gmx.net> writes:
> There remains an issue with the DIFFs. I have setup a diff.exe from the
> GnuWin32 tools which works with the command line from
> mailer.conf.example. The diffs are added to the commit mails.
> BUT: Each line from the diff contains an extra CRLF pair.

I saw the same extra lines in the emailed diffs. I don't know if this is
the correct fix or not, but changing the popen2/popen4 modes to text
instead of binary worked for me...

regards,
markt

Index: mailer.py
===================================================================
--- mailer.py (revision 12828)
+++ mailer.py (working copy)
@@ -107,9 +107,9 @@
         cmd = argv_to_command_string(cmd)
       if capturestderr:
         self.fromchild, self.tochild, self.childerr \
- = popen2.popen3(cmd, mode='b')
+ = popen2.popen3(cmd, mode='t')
       else:
- self.fromchild, self.tochild = popen2.popen2(cmd, mode='b')
+ self.fromchild, self.tochild = popen2.popen2(cmd, mode='t')
         self.childerr = None

     def wait(self):
@@ -123,7 +123,7 @@
     def __init__(self, cmd):
       if type(cmd) != types.StringType:
         cmd = argv_to_command_string(cmd)
- self.fromchild, self.tochild = popen2.popen4(cmd, mode='b')
+ self.fromchild, self.tochild = popen2.popen4(cmd, mode='t')

     def wait(self):
       rv = self.fromchild.close()

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jan 23 22:33:14 2005

This is an archived mail posted to the Subversion Dev mailing list.