[Secure-testing-commits] r47703 - bin

[Ben Hutchings]

Author: benh
Date: 2017-01-03 20:13:10 +0000 (Tue, 03 Jan 2017)
New Revision: 47703

Modified:
   bin/gen-DSA
Log:
bin/gen-DSA: Fix wrapping of CVE ID list longer than 8 IDs

Global replacement doesn't work very well when matching .+ each time.


Modified: bin/gen-DSA
===================================================================
--- bin/gen-DSA	2017-01-03 20:05:53 UTC (rev 47702)
+++ bin/gen-DSA	2017-01-03 20:13:10 UTC (rev 47703)
@@ -188,7 +188,7 @@
 CVE="$(split_n_sort "$CVE" -V)"
 cve_spacing="$(right_space '' 17)"
 
-sed_cmd='s/((CVE-[0-9-]+[ ]+){4})(.+)$/\1\\n'"$cve_spacing"'\3/g;P;D'
+sed_cmd='s/((CVE-[0-9-]+[ ]+){4})/\1\\n'"$cve_spacing"'/g;P;D'
 CVE_LIST="$(printf '%s' "$CVE" | sed -r "$sed_cmd")"
 
 for id in $CVE; do