On Sun, 2020-11-15 at 10:16 +0100, Johannes Schauer wrote:

> This has now been fixed by this commit:

I note that coverage.sh and make_mirror.sh aren't fixed, but I guess
you plan to just hardcode -security in them once bullseye is released?

Personally I would have used Distro::Info instead of reimplementing it
(and CSV parsing etc), especially since the CSV file could gain quotes
and other file format changes the new code isn't prepared to handle.

I noticed that there is code nearby to the part that you changed that
still uses the old approach of hardcoded suite names:

...
            if ($matching_version >= 11) {
                # starting from bullseye use
                $sourceslist
                  .= "deb$signedby $secmirror $suite-security" . " $compstr\n";
            } else {
                $sourceslist
                  .= "deb$signedby $secmirror $suite/updates" . " $compstr\n";
            }
        } else {
            if (any { $_ eq $suite } ('bullseye', 'bookworm')) {
                # starting from bullseye use
                $sourceslist
                  .= "deb$signedby $secmirror $suite-security" . " $compstr\n";
            } else {
                $sourceslist
                  .= "deb$signedby $secmirror $suite/updates" . " $compstr\n";
            }
        }
...

-- 
bye,
pabs

https://wiki.debian.org/PaulWise

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to