mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-12 23:51:08 +00:00
pbuilder-dist: Explicitly use debian keyring when working with a
Debian chroot, working around #599695
This commit is contained in:
parent
87e4054245
commit
230cc212ce
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -25,6 +25,10 @@ ubuntu-dev-tools (0.105) UNRELEASED; urgency=low
|
||||
[ Christopher James Halse Rogers ]
|
||||
* mk-sbuild: Add support for btrfs-snapshot based chroots
|
||||
|
||||
[ Iain Lane ]
|
||||
* pbuilder-dist: Explicitly use debian keyring when working with a
|
||||
Debian chroot, working around #599695
|
||||
|
||||
-- Stefano Rivera <stefanor@ubuntu.com> Wed, 27 Oct 2010 23:20:06 +0200
|
||||
|
||||
ubuntu-dev-tools (0.104) experimental; urgency=low
|
||||
|
1
debian/control
vendored
1
debian/control
vendored
@ -21,6 +21,7 @@ Depends: binutils,
|
||||
diffstat,
|
||||
dpkg-dev,
|
||||
lsb-release,
|
||||
debian-archive-keyring,
|
||||
python-apt (>= 0.7.93~),
|
||||
python-debian (>= 0.1.15),
|
||||
python-launchpadlib (>= 1.5.7),
|
||||
|
@ -218,6 +218,8 @@ class pbuilder_dist:
|
||||
|
||||
if self.target_distro in debian_distros:
|
||||
arguments.append('--mirror "ftp://ftp.debian.org/debian"')
|
||||
# work around bug #599695
|
||||
arguments.append('--debootstrapopts --keyring=/usr/share/keyrings/debian-archive-keyring.gpg')
|
||||
components = 'main'
|
||||
if self.extra_components:
|
||||
components += ' contrib non-free'
|
||||
|
Loading…
x
Reference in New Issue
Block a user