Use .format(**<dict>) for formatting LIST_NAMES. Wrap long-lines (using multi-line quoted strings).

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@38901 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 13 insertions, 9 deletions

diff --git a/bin/lts-cve-triage.py b/bin/lts-cve-triage.py
index 58f09fdde7..383c5b2105 100755
--- a/bin/lts-cve-triage.py
+++ b/bin/lts-cve-triage.py
@@ -20,24 +20,28 @@ import collections
 
 from tracker_data import TrackerData, RELEASES
 
-this_lts = RELEASES['lts']
-next_lts = RELEASES['next_lts']
-
 LIST_NAMES = (
     ('triage_already_in_dsa_needed',
-     'Issues to triage for {this_lts} that are already in dsa-needed'.format(this_lts=this_lts)),
+     ('Issues to triage for {lts} that are already in dsa-needed'
+     ).format(**RELEASES)),
     ('triage_likely_nodsa',
-     'Issues to triage for {this_lts} that are no-dsa in {next_lts}'.format(this_lts=this_lts, next_lts=next_lts)),
+     ('Issues to triage for {lts} that are no-dsa in {next_lts}'
+     ).format(**RELEASES)),
     ('triage_possible_easy_fixes',
-     'Issues not yet triaged for {}, but probably easy to fix (because already fixed in {})'.format(this_lts, next_lts)),
+     ('Issues not yet triaged for {lts}, but probably easy to fix (because'
+      'already fixed in {next_lts})'
+     ).format(**RELEASES)),
     ('triage_other_not_triaged_in_next_lts',
-     'Other issues to triage for {this_lts} (not yet triaged for {next_lts})'.format(this_lts=this_lts, next_lts=next_lts)),
+     ('Other issues to triage for {lts} (not yet triaged for {next_lts})'
+     ).format(**RELEASES)),
     ('triage_other',
      'Other issues to triage (no special status)'),
     ('unexpected_nodsa',
-     'Issues tagged no-dsa in {this_lts} that are open in {next_lts}'.format(this_lts=this_lts, next_lts=next_lts)),
+     ('Issues tagged no-dsa in {lts} that are open in {next_lts}'
+     ).format(**RELEASES)),
     ('possible_easy_fixes',
-     'Issues from dla-needed.txt that are already fixed in {next_lts}'.format(next_lts=next_lts)),
+     ('Issues from dla-needed.txt that are already fixed in {next_lts}'
+     ).format(**RELEASES)),
 )
 
 lists = collections.defaultdict(lambda: collections.defaultdict(lambda: []))