[Python-checkins] python/dist/src/Tools/scripts logmerge.py, 1.11, 1.12

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv10180

Modified Files:
	logmerge.py 
Log Message:
When piping output into a pager like "less", quiting the pager before
the output was consumed would cause and exception to be raise in
logmerge; suppress this specific error, because it's not helpful.


Index: logmerge.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/logmerge.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** logmerge.py	20 Apr 2003 00:59:24 -0000	1.11
--- logmerge.py	14 Aug 2003 15:52:33 -0000	1.12
***************
*** 35,39 ****
  """
  
! import os, sys, getopt, re
  
  sep1 = '='*77 + '\n'                    # file separator
--- 35,39 ----
  """
  
! import os, sys, errno, getopt, re
  
  sep1 = '='*77 + '\n'                    # file separator
***************
*** 178,180 ****
          prevtext = text
  
! main()
--- 178,184 ----
          prevtext = text
  
! try:
!     main()
! except IOError, e:
!     if e.errno != errno.EPIPE:
!         raise