format_changelog.py: tweak hyphenation rules

Mark all our generated command names, and anything with a
double-hyphen, as unhyphenatable.

diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py
index c84bf3ccf40303aea69ebe6fd3302bec6a64c29f..6b4e75734584cfb26a6f748d8e1c7c335607cb49 100755 (executable)
--- a/scripts/maint/format_changelog.py
+++ b/scripts/maint/format_changelog.py
@@ -34,6 +34,9 @@ import optparse
 
 NO_HYPHENATE=set("""
 pf-divert
+tor-resolve
+tor-gencert
+tor-fw-helper
 """.split())
 
 LASTLINE_UNDERFLOW_EXPONENT = 1
@@ -117,6 +120,9 @@ def wrap_graf(words, prefix_len1=0, prefix_len2=0, width=72):
     return lines
 
 def hyphenateable(word):
+    if "--" in word:
+        return False
+
     if re.match(r'^[^\d\-]\D*-', word):
         stripped = re.sub(r'^\W+','',word)
         stripped = re.sub(r'\W+$','',word)