From b26dbaee681e400a52706c001b486900e8fdc4c4 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 5 May 2012 19:37:41 +0200 Subject: [PATCH] check-mir: Use optparse to display --help --- check-mir | 10 +++++++++- debian/changelog | 2 +- ubuntutools/test/test_help.py | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/check-mir b/check-mir index a63bd99..2d707db 100755 --- a/check-mir +++ b/check-mir @@ -21,10 +21,13 @@ # this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import apt import sys +import optparse import os.path +import apt + + def check_support(apt_cache, pkgname, alt=False): '''Check if pkgname is in main or restricted. @@ -118,6 +121,11 @@ def check_binary_dependencies(apt_cache, control): return any_unsupported def main(): + parser = optparse.OptionParser( + description="Check if any of a package's build or binary " + "dependencies are in universe or multiverse. " + "Run this inside an unpacked source package") + parser.parse_args() apt_cache = apt.Cache() if not os.path.exists('debian/control'): diff --git a/debian/changelog b/debian/changelog index 2068a91..84e3eab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +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) + * submittodebian, check-mir: Use optparse to display --help (LP: #988009) -- Stefano Rivera Wed, 25 Apr 2012 17:38:58 +0200 diff --git a/ubuntutools/test/test_help.py b/ubuntutools/test/test_help.py index 00cab1e..3d0c32a 100644 --- a/ubuntutools/test/test_help.py +++ b/ubuntutools/test/test_help.py @@ -25,7 +25,6 @@ from ubuntutools import subprocess from ubuntutools.test import unittest BLACKLIST = { - 'check-mir': 'No Help', 'check-symbols': 'No Help', 'grep-merges': 'No Help', 'pbuilder-dist-simple': 'No Help',