diff --git a/debian/changelog b/debian/changelog index 2e0977f..912bf8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ubuntu-dev-tools (0.142) UNRELEASED; urgency=low Do enough argument parsing to handle --help (LP: #988009) * dgetlp: Require a UTF-8 locale, or it'll crash when displaying errors (LP: #979117) + * pbuilder-dist: Don't try to enable -updates for Debian testing + (LP: #993006) -- Stefano Rivera Wed, 25 Apr 2012 17:38:58 +0200 diff --git a/pbuilder-dist b/pbuilder-dist index bb6227d..8757678 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -266,11 +266,14 @@ class PbuilderDist: othermirrors = [] if self.target_distro in self._debian_distros: debian_info = DebianDistroInfo() - if (debian_info.codename(self.target_distro) or self.target_distro - in (debian_info.devel(), 'experimental')): + codename = debian_info.codename(self.target_distro, + default=self.target_distro) + if codename in (debian_info.devel(), 'experimental'): self.enable_security = False self.enable_updates = False self.enable_proposed = False + elif codename == 'testing': + self.enable_updates = False if self.enable_security: othermirrors.append('deb %s %s/updates %s'