diff options
author | Emilio Pozuelo Monfort <pochu@debian.org> | 2022-01-27 19:07:32 +0100 |
---|---|---|
committer | Emilio Pozuelo Monfort <pochu@debian.org> | 2022-02-01 16:16:50 +0100 |
commit | 5283362a2bea9ea77a19c816453cba4b53d8ecb8 (patch) | |
tree | 1ad84e1cf4d92fd655dc04bf1428a52e56919616 /bin/gen-DSA | |
parent | 4a33a750407e377570dfe884e2eabb647194c0c2 (diff) |
gen-DSA: diff and commit changes to extracvefile
In case we're processing a dist that uses an ExtendFile.
Diffstat (limited to 'bin/gen-DSA')
-rwxr-xr-x | bin/gen-DSA | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/gen-DSA b/bin/gen-DSA index e86a3721db..a78530466b 100755 --- a/bin/gen-DSA +++ b/bin/gen-DSA @@ -414,9 +414,12 @@ EOF echo "$IDMODE text written to ./$IDMODE-$DAID" if [ "$IDMODE" = "DLA" ] || [ "$IDMODE" = "ELA" ]; then idmode=$(echo "$IDMODE" | tr A-Z a-z) + if [ -n "${DISTS}" ]; then + extracvefile=`jq -r ".distributions.${DISTS}.maincvefile" data/config.json` + fi if [ -d .git ]; then echo "Made the following changes:" - git diff -- data/$IDMODE/list data/CVE/list $needed_file + git diff -- data/$IDMODE/list data/CVE/list $extracvefile $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 @@ -426,7 +429,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 data/CVE/list $needed_file + git add data/$IDMODE/list data/CVE/list $extracvefile $needed_file git commit -m "Reserve $IDMODE-$DAID for $PACKAGE" git push origin master fi |