* pbuilder-dist:

- Do not show a warning when "experimental" is used; there is no
     debootstrap file for it but it should just work anyway.
* bash_completion/pbuilder-dist:
   - Enable auto-completion for "pbuilder-experimental".
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2010-09-21 20:45:45 +02:00
parent 4b13534eea
commit 4ca97770da
3 changed files with 16 additions and 6 deletions

View File

@ -31,5 +31,5 @@ _pbuilder-dist()
return 0
}
[ "$have" ] && complete -F _pbuilder-dist -o filenames \
{pbuilder,cowbuilder}-{dist,dapper,hardy,jaunty,karmic,lucid,maverick,natty,sarge,etch,lenny,squeeze,sid}
{pbuilder,cowbuilder}-{dist,dapper,hardy,jaunty,karmic,lucid,maverick,natty,sarge,etch,lenny,squeeze,sid,experimental}
# Make it pbuilder-* if you know how to do it

9
debian/changelog vendored
View File

@ -12,7 +12,14 @@ ubuntu-dev-tools (0.103) UNRELEASED; urgency=low
- Use output of dpkg --print-architecture command to correctly display
platform architecture (Closes: #594424).
-- Luca Falavigna <dktrkranz@debian.org> Mon, 20 Sep 2010 18:11:24 +0200
[ Siegfried-Angel Gevatter Pujals ]
* pbuilder-dist:
- Do not show a warning when "experimental" is used; there is no
debootstrap file for it but it should just work anyway.
* bash_completion/pbuilder-dist:
- Enable auto-completion for "pbuilder-experimental".
-- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Tue, 21 Sep 2010 20:43:27 +0200
ubuntu-dev-tools (0.102) experimental; urgency=low

View File

@ -124,10 +124,13 @@ class pbuilder_dist:
if not os.path.isfile(os.path.join('/usr/share/debootstrap/scripts/', distro)):
if os.path.isdir('/usr/share/debootstrap/scripts/'):
answer = ask('Warning: Unknown distribution «%s». Do you '\
'want to continue [y/N]? ' % distro)
if answer not in ('y', 'Y'):
sys.exit(0)
# Debian experimental doesn't have a debootstrap file but
# should work nevertheless.
if distro not in debian_distros:
answer = ask('Warning: Unknown distribution «%s». Do you ' \
'want to continue [y/N]? ' % distro)
if answer not in ('y', 'Y'):
sys.exit(0)
else:
print 'Please install package "debootstrap".'
sys.exit(1)