Fix pull-revu-source help, and return 0

This commit is contained in:
Stefano Rivera 2010-12-22 17:14:48 +02:00
parent df6b32086b
commit 34b1991bdd
3 changed files with 10 additions and 7 deletions

7
debian/changelog vendored
View File

@ -16,8 +16,9 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low
* Add the beginnings of a test suite. (LP: #690386) * Add the beginnings of a test suite. (LP: #690386)
- Switch to setuptools, to support setup.py test. - Switch to setuptools, to support setup.py test.
- Test for that every script can run --help and return 0. - Test for that every script can run --help and return 0.
- 404main, merge-changelog, pull-debian-debdiff, pull-debian-source: - 404main, merge-changelog, pull-debian-debdiff, pull-debian-source,
Return 0 after showing help. pull-revu-source:
+ Return 0 after showing help.
* ubuntutools/common.py: Remove https_proxy unsetting code, working around * ubuntutools/common.py: Remove https_proxy unsetting code, working around
LP: #94130. LP: #94130.
@ -32,7 +33,7 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low
- Fix 'str' object has no attribute 'startwith' crash caused by a typo. - Fix 'str' object has no attribute 'startwith' crash caused by a typo.
- Fix crash if uploading to ubuntu without building the package before. - Fix crash if uploading to ubuntu without building the package before.
-- Stefano Rivera <stefanor@ubuntu.com> Wed, 22 Dec 2010 16:52:55 +0200 -- Stefano Rivera <stefanor@ubuntu.com> Wed, 22 Dec 2010 17:13:59 +0200
ubuntu-dev-tools (0.108) experimental; urgency=low ubuntu-dev-tools (0.108) experimental; urgency=low

View File

@ -20,6 +20,7 @@
use warnings; use warnings;
use strict; use strict;
use File::Basename;
use LWP::Simple; use LWP::Simple;
use Getopt::Long; use Getopt::Long;
@ -27,10 +28,10 @@ die("Please install 'devscripts'\n") if(! grep -x "$_/dget", split(':',$ENV{'PAT
my $REVU = "revu.ubuntuwire.com"; my $REVU = "revu.ubuntuwire.com";
my($package) = lc($ARGV[0]) || usage(); my($package) = lc($ARGV[0]) || usage(2);
my($help)=0; my($help)=0;
GetOptions('help' => \$help); GetOptions('help' => \$help);
usage() if($help); usage(0) if($help);
dget(getURL()); dget(getURL());
@ -47,6 +48,8 @@ sub dget {
} }
sub usage { sub usage {
my($exit) = @_;
my($name)=basename($0); my($name)=basename($0);
die("USAGE: $name [-h] <source package>\n"); print("USAGE: $name [-h] <source package>\n");
exit($exit);
} }

View File

@ -33,7 +33,6 @@ BLACKLIST = {
'massfile': 'No Help. Leaves files in .', 'massfile': 'No Help. Leaves files in .',
'mk-sbuild': 'Fires up apt-get before showing help', 'mk-sbuild': 'Fires up apt-get before showing help',
'pbuilder-dist-simple': 'No Help', 'pbuilder-dist-simple': 'No Help',
'pull-revu-source': 'Throws Error',
'setup-packaging-environment': 'Throws Error', 'setup-packaging-environment': 'Throws Error',
'submittodebian': 'No Help', 'submittodebian': 'No Help',
'ubuntu-iso': 'No Help', 'ubuntu-iso': 'No Help',