From 230cc212ce403a646be09bae820d335bce717159 Mon Sep 17 00:00:00 2001
From: Iain Lane <laney@ubuntu.com>
Date: Fri, 29 Oct 2010 14:54:02 +0100
Subject: [PATCH] pbuilder-dist: Explicitly use debian keyring when working
 with a Debian chroot, working around #599695

---
 debian/changelog | 4 ++++
 debian/control   | 1 +
 pbuilder-dist    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e9061eb..75d279a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index bcb03bb..1014741 100644
--- a/debian/control
+++ b/debian/control
@@ -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),
diff --git a/pbuilder-dist b/pbuilder-dist
index 5b048a5..52fc179 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -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'