about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xbuildtools/makeman7
-rw-r--r--doc/HISTORY4
2 files changed, 5 insertions, 6 deletions
diff --git a/buildtools/makeman b/buildtools/makeman
index b1d30afd..dee6d6ef 100755
--- a/buildtools/makeman
+++ b/buildtools/makeman
@@ -332,9 +332,7 @@ def main(args, mainout=sys.stdout, mainerr=sys.stderr):
                 outdoc = makeman(name, file, indoc)
             except:
                 os.remove(tempfile)
-                # Pass the exception upwards
-                (exc_type, exc_value, exc_traceback) = sys.exc_info()
-                raise exc_type, exc_value, exc_traceback
+                raise
             if outdoc == indoc:
                 os.remove(tempfile)
             if outdoc is None:
@@ -355,8 +353,7 @@ def main(args, mainout=sys.stdout, mainerr=sys.stderr):
         return 4
     except:
         if verbosity:
-            (exc_type, exc_value, exc_traceback) = sys.exc_info()
-            raise exc_type, exc_value, exc_traceback
+            raise
         else:
             mainerr.write("makeman: internal error!\n")
             return 5
diff --git a/doc/HISTORY b/doc/HISTORY
index e8a65530..4fb1d815 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -60,9 +60,11 @@ not yet  BJH  Release 10.79.00
               (September 2007), but wouldn't even compile until Netpbm 10.42
               (March 2008)).
 
-              Installnetpbm: Accept globs for directory name responses
+              installnetpbm: Accept globs for directory name responses
               (notably, ~/DIR).
 
+              makeman: Make it work with Python 3.6.
+
               Build: don't try to build standardppmdfont.c if it already
               exists (so don't require ppmdcfont to exist).  Broken around
               Netpbm 10.35 (2006).