From 7d599482f29ae45c27735b21fab3c7e8db20e87a Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Thu, 14 Aug 2003 15:52:33 +0000 Subject: 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. --- Tools/scripts/logmerge.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Tools/scripts/logmerge.py b/Tools/scripts/logmerge.py index 977324d..54d1676 100755 --- a/Tools/scripts/logmerge.py +++ b/Tools/scripts/logmerge.py @@ -34,7 +34,7 @@ XXX This code was created by reverse engineering CVS 1.9 and RCS 5.7 from their output. """ -import os, sys, getopt, re +import os, sys, errno, getopt, re sep1 = '='*77 + '\n' # file separator sep2 = '-'*28 + '\n' # revision separator @@ -177,4 +177,8 @@ def format_output(database): prev.append((date, working_file, rev, author)) prevtext = text -main() +try: + main() +except IOError, e: + if e.errno != errno.EPIPE: + raise -- cgit v0.12