diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2021-11-06 22:06:25 +0100 |
|---|---|---|
| committer | Salvatore Bonaccorso <carnil@debian.org> | 2021-11-06 22:06:25 +0100 |
| commit | 77f1b697fc85e9efeb217c7dc1a138d9378f556e (patch) | |
| tree | 6cce1b960dfb9fa31d4905e6425bdd2bae5a1676 /bin | |
| parent | fcb18e22317acb79f2029980d9f758f380beb774 (diff) | |
gen-DSA: Hanlde CVE list in DLA/ELA mode as well
The recent addition of the remove-cve-dist-tags hook in gen-D[SL]A
script removes entries from data/CVE/list when they had a no-dsa (or
it's substates) which are handled in the update.
When gen-DSA script is invoked in DLA mode though, there is a mechanism
to automatically commit the changes (and option to push) but that did
not take into account the changes in data/CVE/list.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/gen-DSA | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/gen-DSA b/bin/gen-DSA index 781d4250cc..0fd013d1e4 100755 --- a/bin/gen-DSA +++ b/bin/gen-DSA @@ -412,7 +412,7 @@ EOF idmode=$(echo "$IDMODE" | tr A-Z a-z) if [ -d .git ]; then echo "Made the following changes:" - git diff -- data/$IDMODE/list $needed_file + git diff -- data/$IDMODE/list data/CVE/list $needed_file if ! git diff-index --name-only HEAD -- $needed_file | grep -qs . && [ $TYPE = security ]; then warn "did not make any changes to $needed_file - this may indicate duplicate work or misspelled package name" fi @@ -422,7 +422,7 @@ EOF echo -n "Do you want to commit and push them now ? [Yn] " read reply if [ "$reply" = "Y" ] || [ "$reply" = "" ] || [ "$reply" = "y" ]; then - git add data/$IDMODE/list $needed_file + git add data/$IDMODE/list data/CVE/list $needed_file git commit -m "Reserve $IDMODE-$DAID for $PACKAGE" git push origin master fi |