mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-05-20 13:21:28 +00:00
Merge branch 'lp1916633' of git+ssh://git.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools
MR: https://code.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/399686 Signed-off-by: Mattia Rizzolo <mattia@debian.org>
This commit is contained in:
commit
eca442bf35
@ -294,9 +294,14 @@ class PbuilderDist(object):
|
|||||||
self.enable_updates = False
|
self.enable_updates = False
|
||||||
|
|
||||||
if self.enable_security:
|
if self.enable_security:
|
||||||
othermirrors.append('deb %s %s/updates %s'
|
pocket = '-security'
|
||||||
|
with suppress(ValueError):
|
||||||
|
# before bullseye (version 11) security suite is /updates
|
||||||
|
if float(debian_info.version(codename)) < 11.0:
|
||||||
|
pocket = '/updates'
|
||||||
|
othermirrors.append('deb %s %s%s %s'
|
||||||
% (config.get_value('DEBSEC_MIRROR'),
|
% (config.get_value('DEBSEC_MIRROR'),
|
||||||
self.target_distro, components))
|
self.target_distro, pocket, components))
|
||||||
if self.enable_updates:
|
if self.enable_updates:
|
||||||
othermirrors.append('deb %s %s-updates %s'
|
othermirrors.append('deb %s %s-updates %s'
|
||||||
% (mirror, self.target_distro, components))
|
% (mirror, self.target_distro, components))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user