[Git][security-tracker-team/security-tracker][master] gen-DSA: Hanlde CVE list in DLA/ELA mode as well

[Salvatore Bonaccorso (@carnil)]

Salvatore Bonaccorso pushed to branch master at Debian Security Tracker / security-tracker


Commits:
77f1b697 by Salvatore Bonaccorso at 2021-11-06T22:06:25+01:00
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.

- - - - -


1 changed file:

- bin/gen-DSA


Changes:

=====================================
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



View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/77f1b697fc85e9efeb217c7dc1a138d9378f556e

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/77f1b697fc85e9efeb217c7dc1a138d9378f556e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-security-tracker-commits/attachments/20211106/71ec3abc/attachment-0001.htm>