diff options
Diffstat (limited to 'textproc/doclifter/patches/patch-aa')
| -rw-r--r-- | textproc/doclifter/patches/patch-aa | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/textproc/doclifter/patches/patch-aa b/textproc/doclifter/patches/patch-aa index 076fc0bf964..725b650e882 100644 --- a/textproc/doclifter/patches/patch-aa +++ b/textproc/doclifter/patches/patch-aa @@ -1,7 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $ ---- manlifter.orig Fri Dec 24 23:44:11 2004 -+++ manlifter Sun Jan 9 14:06:09 2005 -@@ -300,7 +300,8 @@ +$NetBSD: patch-aa,v 1.3 2007/01/15 23:40:46 wiz Exp $ + +--- manlifter.orig 2006-12-25 07:43:35.000000000 +0000 ++++ manlifter +@@ -316,7 +316,8 @@ def massrun(files, options): signal.signal(signal.SIGUSR2, report) signal.signal(signal.SIGHUP, bailout) signal.signal(signal.SIGINT, bailout) @@ -11,7 +12,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $ signal.signal(signal.SIGTERM, bailout) print "%Test started", time.ctime(), "\n" try: -@@ -557,22 +558,18 @@ +@@ -584,22 +585,17 @@ def doclifter_driver(options, arguments) fp.close() if __name__ == "__main__": @@ -21,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $ - if os.path.exists(where): - break - else: -- sys.stderr.write("manlifter: can't find doclifter!") +- sys.stderr.write("manlifter: can't find doclifter!\n") - sys.exit(1) - # Import it, so we can modify it while the test is running without - # screwing up the results @@ -31,16 +32,15 @@ $NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $ - os.system("cp %s doclifter_test%s.py" % (where, os.getpid())) - exec 'import doclifter_test%s' % os.getpid() - exec "doclifter=doclifter_test%s" % os.getpid() -+ try: -+ doclifter = imp.load_module('doclifter', fp, '@@BIN_PATH@@/doclifter', ('.py', 'U', 1)) -+ except ImportError: -+ sys.stderr.write("manlifter: can't find doclifter!") -+ sys.exit(1) ++ try: ++ doclifter = imp.load_module('doclifter', fp, '@@BIN_PATH@@/doclifter', ('.py', 'U', 1)) ++ except ImportError: ++ sys.stderr.write("manlifter: can't find doclifter!") ++ sys.exit(1) finally: - os.system("rm -f doclifter_test%s.py*" % os.getpid()) -+ if fp: -+ fp.close() -+ ++ if fp: ++ fp.close() # Gather options (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:p:qs:Sv") # Do the real work |