From 083d44f676856384fded7369c3373be41b28c075 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 5 May 2012 19:34:02 +0200 Subject: [PATCH] submittodebian: Use optparse to display --help (LP: #988009) --- debian/changelog | 1 + submittodebian | 5 +++++ ubuntutools/test/test_help.py | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6d209e0..2068a91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ubuntu-dev-tools (0.142) UNRELEASED; urgency=low * mk-sbuild: Support kmod, when checking for overlayfs availability. * pbuilder-dist: improve bash_completion for *.dsc files. Thanks Maarten Bezemer. (Closes: #670924, LP: #770529) + * submittodebian: Use optparse to display --help (LP: #988009) -- Stefano Rivera Wed, 25 Apr 2012 17:38:58 +0200 diff --git a/submittodebian b/submittodebian index 48122a7..6085bf4 100755 --- a/submittodebian +++ b/submittodebian @@ -22,6 +22,7 @@ # # ################################################################## +import optparse import os import re import shutil @@ -190,6 +191,10 @@ reportbug --configure for its configuration wizard. sys.exit(1) def main(): + parser = optparse.OptionParser( + description='Submit the Ubuntu changes in a package to Debian. ' + 'Run inside an unpacked Ubuntu source package.') + parser.parse_args() check_reportbug_config() changelog_file = (check_file('debian/changelog', critical = False) or check_file('../debian/changelog')) diff --git a/ubuntutools/test/test_help.py b/ubuntutools/test/test_help.py index e07eeb9..00cab1e 100644 --- a/ubuntutools/test/test_help.py +++ b/ubuntutools/test/test_help.py @@ -30,7 +30,6 @@ BLACKLIST = { 'grep-merges': 'No Help', 'pbuilder-dist-simple': 'No Help', 'setup-packaging-environment': 'Throws Error', - 'submittodebian': 'No Help', 'ubuntu-iso': 'No Help', } TIMEOUT = 5