From 4ca97770daee0e750ea35afaf79ceb1f08aca68e Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Tue, 21 Sep 2010 20:45:45 +0200 Subject: [PATCH] * 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". --- bash_completion/pbuilder-dist | 2 +- debian/changelog | 9 ++++++++- pbuilder-dist | 11 +++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bash_completion/pbuilder-dist b/bash_completion/pbuilder-dist index 2da2e2a..cfe3b3d 100644 --- a/bash_completion/pbuilder-dist +++ b/bash_completion/pbuilder-dist @@ -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 diff --git a/debian/changelog b/debian/changelog index b53827b..445805b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 Tue, 21 Sep 2010 20:43:27 +0200 ubuntu-dev-tools (0.102) experimental; urgency=low diff --git a/pbuilder-dist b/pbuilder-dist index f377cae..28d2067 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -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)