From df9dde43b4b097bda704100e3a4146e679ca5606 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Sat, 28 Sep 2019 16:13:19 +0200 Subject: Allow again removal of package/{old,}stable entries from *-needed list Since the regular expression was tightened to fix a bug and not remove e.g. spice ans spice-gtk from a *-needed.list removal of specific entries of packages/stable or packages/oldstable got broken (wich is used by the Debian security team to mark entries which only need an update in one of the supported suites). Retain the desired fixed behaviour but try to allow to properly remove package/{old,}stable entries again. Fixes: b3070631dfbb ("bin/gen-DSA: Fix package removal from the needed_file. Don't remove packages starting with the same string as the to be removed package.") Signed-off-by: Salvatore Bonaccorso --- bin/gen-DSA | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/gen-DSA b/bin/gen-DSA index 7295ac8f70..3b73dfbaaa 100755 --- a/bin/gen-DSA +++ b/bin/gen-DSA @@ -386,7 +386,7 @@ EOF cat $daid_entry data/$IDMODE/list > $tmp_list cat $tmp_list > data/$IDMODE/list rm -f $tmp_list - sed -rn '/^'"$PACKAGE"'(\s.*|$)\b/{: next;n;/^\s/b next;d};p' $needed_file > $needed_file.new + sed -rn '/^'"$PACKAGE"'(\/\w+)?(\s.*|$)\b/{: next;n;/^\s/b next;d};p' $needed_file > $needed_file.new mv $needed_file.new $needed_file echo "$IDMODE text written to ./$IDMODE-$DAID" if [ "$IDMODE" = "DLA" ] || [ "$IDMODE" = "ELA" ]; then -- cgit v1.2.3