From a53cac66cd4e33cc43dbcc3bb009f1ecdd4d4e21 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sun, 25 Jan 2009 16:49:11 +0100 Subject: [PATCH] buildd: display help message if no parameters are passed. --- buildd | 16 ++++++++++++---- debian/changelog | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/buildd b/buildd index 6c91f26..ab20dcf 100755 --- a/buildd +++ b/buildd @@ -64,7 +64,11 @@ optParser.add_option_group(retryRescoreOptions) (options, args) = optParser.parse_args() # 'help' called by itself - show our help. -if args[0].lower() in ("help") and len(args) == 1: +try: + if args[0].lower() in ("help") and len(args) == 1: + optParser.print_help() + sys.exit(0) +except IndexError: optParser.print_help() sys.exit(0) @@ -72,9 +76,13 @@ if args[0].lower() in ("help") and len(args) == 1: if len(args) < 3: optParser.error("Incorrect number of arguments.") -package = str(args[0]).lower() -release = str(args[1]).lower() -op = str(args[2]).lower() +try: + package = str(args[0]).lower() + release = str(args[1]).lower() + op = str(args[2]).lower() +except: + optParser.print_help() + sys.exit(0) # Check our operation. if op not in ("rescore", "retry", "status"): diff --git a/debian/changelog b/debian/changelog index f0cdd4e..a6aebbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,11 @@ ubuntu-dev-tools (0.60) UNRELEASED; urgency=low * ubuntutools/lp/functions.py: Rename urlopener import as it conflicts with a variable, causing an error. - -- Iain Lane Sun, 25 Jan 2009 01:07:28 +0000 + [ Luca Falavigna ] + * pull-debian-source: do not fail if package name contains a hypen. + * buildd: display help message if no parameters are passed. + + -- Luca Falavigna Sun, 25 Jan 2009 16:48:02 +0100 ubuntu-dev-tools (0.59) jaunty; urgency=low