Hi,
Chris Lamb <la...@debian.org> (2019-06-05):
> Apologies for the delay in getting back to you all here.
>
> I've got this working locally here although we require the following
> change to the gen-sources.list.udeb script. Basically, we need print
> three columns if we have "[options]", otherwise we just print two:
>
> diff --git a/build/util/gen-sources.list.udeb
> b/build/util/gen-sources.list.udeb
> index 539345a45..ac416266a 100755
> --- a/build/util/gen-sources.list.udeb
> +++ b/build/util/gen-sources.list.udeb
> @@ -36,10 +36,9 @@ get_mirrors() {
> [ -s $file ] || continue
> grep '^deb[[:space:]]' $file | \
> grep -v '^deb[[:space:]]\+cdrom:' | \
> - sed 's,^deb \[[^]]*\] ,deb ,' | \
> grep -v
> '\(security.debian.org\|volatile.debian.\(net\|org\)\)' | \
> grep '[[:space:]]main' | \
> - awk '{print $1 " " $2}' | \
> + awk '{ print (substr($2, 0, 1) == "[") ? $1 " " $2 " " $3 :
> $1 " " $2 }' | \
> sed 's,^deb file,deb copy,' | \
> sed 's,/* *$,,'
> done
>
> How does this look to you? Shell "golf" suggestions welcome,
> naturally. (I tried a few sed variants but it got a bit messy.)
I'm a little wary with possibly merging this late in the release cycle,
so I'd rather get see that looked at after Buster is out. With extra
apologies since I've just broken the context of your patch by removing
the volatile references (in both debian-installer{,-netboot-images}.git)
since volatile disappeared with Squeeze and it's about time we dealt
with it… (https://www.debian.org/volatile/)
Cheers,
--
Cyril Brulebois (k...@debian.org) <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant
signature.asc
Description: PGP signature
