pbuilder-dist: Don't try to enable -updates for Debian testing

(LP: #993006)
This commit is contained in:
Stefano Rivera 2012-05-06 08:36:37 +02:00
parent 165bb84bf5
commit 4dbde5f886
2 changed files with 7 additions and 2 deletions

2
debian/changelog vendored
View File

@ -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 <stefanor@debian.org> Wed, 25 Apr 2012 17:38:58 +0200

View File

@ -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'