summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <pochu@debian.org>2021-11-03 13:25:33 +0100
committerEmilio Pozuelo Monfort <pochu@debian.org>2021-11-03 13:53:21 +0100
commit5c02f26e36284983e47006198afb47857a27b24a (patch)
tree5ccc045648b5620304f22f4df8bad1f71c695b60
parent3bda34b9d6e485965ae5881a47d9241a645d71f1 (diff)
gen-DSA: only call remove-cve-dist-tags onceremove-cve-dist-tags-on-DSA
And do it after we've asked for all the versions. Calling the script after asking for each version and before asking for the next is annoying as the script takes some time due to the size of CVE/list. This way not only do we avoid that wait between user inputs, but we also avoid calling the script and thus parsing CVE/list multiple times.
-rwxr-xr-xbin/gen-DSA6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/gen-DSA b/bin/gen-DSA
index 2e47b58e35..781d4250cc 100755
--- a/bin/gen-DSA
+++ b/bin/gen-DSA
@@ -357,6 +357,8 @@ for dist in $RELEASES; do
setvar $dist
done
+DISTS=
+
for dist in $CODENAMES; do
version="$(eval 'printf "%s" "$'"$dist"_VERSION'"')"
if $save && [ -z "$version" ] && grep -q "${dist}_VERSION" "$tmpf"; then
@@ -367,9 +369,11 @@ for dist in $CODENAMES; do
fi
fi
[ -z "$version" ] || setvar "${dist}_VERSION" "$version"
- [ -z "$version" ] || bin/remove-cve-dist-tags "${dist}" "${PACKAGE}" ${CVE}
+ [ -z "$version" ] || DISTS="${DISTS},${dist}"
done
+bin/remove-cve-dist-tags "${DISTS#,}" "${PACKAGE}" ${CVE}
+
if ! $save; then
cat $tmpf
echo

© 2014-2022 Faster IT GmbH | imprint | privacy policy