Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 16:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbuilder-dist: Explicitly use debian keyring when working with a

Browse Source 
Debian chroot, working around #599695
This commit is contained in:
Iain Lane 2010-10-29 14:54:02 +01:00
parent 87e4054245
commit 230cc212ce
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -25,6 +25,10 @@ ubuntu-dev-tools (0.105) UNRELEASED; urgency=low
[ Christopher James Halse Rogers ] [ Christopher James Halse Rogers ]
* mk-sbuild: Add support for btrfs-snapshot based chroots * 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 -- Stefano Rivera <stefanor@ubuntu.com> Wed, 27 Oct 2010 23:20:06 +0200
ubuntu-dev-tools (0.104) experimental; urgency=low ubuntu-dev-tools (0.104) experimental; urgency=low

1
debian/control vendored
View File

@ -21,6 +21,7 @@ Depends: binutils,
diffstat, diffstat,
dpkg-dev, dpkg-dev,
lsb-release, lsb-release,
debian-archive-keyring,
python-apt (>= 0.7.93~), python-apt (>= 0.7.93~),
python-debian (>= 0.1.15), python-debian (>= 0.1.15),
python-launchpadlib (>= 1.5.7), python-launchpadlib (>= 1.5.7),

2
pbuilder-dist
View File

@ -218,6 +218,8 @@ class pbuilder_dist:
if self.target_distro in debian_distros: if self.target_distro in debian_distros:
arguments.append('--mirror "ftp://ftp.debian.org/debian"') 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' components = 'main'
if self.extra_components: if self.extra_components:
components += ' contrib non-free' components += ' contrib non-free'