Merge ~litios/ubuntu-cve-tracker:update-usn-fixme-regex into ubuntu-cve-tracker:master

[David Fernandez Gonzalez]

The USNs complain about placeholders in bash comments.
This updates the regex to ignore them.

[Rodrigo Figueiredo Zaiden (rodrigo-zaiden)]

hey, this is being discussed in
https://code.launchpad.net/~rodrigo-zaiden/ubuntu-cve-tracker/+git/ubuntu-cve-tracker/+merge/438390

I'm glad to see that I've made a very similar proposal hehe.

On that merge request you can notice that Alex explains that the idea is to have a warning on the comments as well, so, it is acting like it is supposed to be. But, it is all open for discussion.

hope it helps.
thanks!

[David Fernandez Gonzalez (litios)]

Oops, thanks Rodrigo!
I totally missed that.

Closing this :)

Unmerged commits

e710607... by David Fernandez Gonzalez on 2023-03-07

sis-generate-usn: don't complain about placeholders in comments

tests:0 (build)

1 → 1 of 1 result

First • Previous • Next • Last

diff --git a/scripts/sis-generate-usn b/scripts/sis-generate-usn
index 8fa14c2..29c0e17 100755
--- a/scripts/sis-generate-usn
+++ b/scripts/sis-generate-usn
@@ -570,7 +570,7 @@ print('#!/bin/bash')
 print('set -e')
 print()
 print('# check for unfixed placeholders - DO NOT REMOVE THE FOLLOWING LINE')
-print('grep -Hn "X""X""X" "${0}" && echo "${0} still contains placeholders / FIXMEs - ensure you fix these all then rerun the script" && exit 1')
+print('grep -EHn "^[^#]*XX""X" "${0}" && echo "${0} still contains placeholders / FIXMEs - ensure you fix these all then rerun the script" && exit 1')
 print()
 print('export PATH=$PATH:%s' % (config['usn_tool']))
 print('export USN=%s'%(usn))