Fixed so we print more than just the first line of help for options with

a short form and text that wraps onto multiple lines.

diff --git a/Lib/distutils/fancy_getopt.py b/Lib/distutils/fancy_getopt.py
index a593354c9d1483ef659a511071b35056a175d9f8..6adfc819c2df5c70c3e0f7d1823d61509692eaca 100644 (file)
--- a/Lib/distutils/fancy_getopt.py
+++ b/Lib/distutils/fancy_getopt.py
@@ -369,9 +369,6 @@ class FancyGetopt:
                 else:
                     lines.append ("  --%-*s  " % (max_opt, long))
 
-                for l in text[1:]:
-                    lines.append (big_indent + l)
-
             # Case 2: we have a short option, so we have to include it
             # just after the long option
             else:
@@ -382,6 +379,9 @@ class FancyGetopt:
                 else:
                     lines.append ("  --%-*s" % opt_names)
 
+            for l in text[1:]:
+                lines.append (big_indent + l)
+
         # for self.option_table
 
         return lines