From e47a99c42a290131087d02f2d03711effbf8c66c Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Sun, 6 May 2012 06:06:41 +0200
Subject: [PATCH] setup-packaging-environment: Display help

---
 debian/changelog              |  4 ++--
 setup-packaging-environment   | 25 +++++++++++++++++++++++++
 ubuntutools/test/test_help.py |  6 ------
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8120757..4c8ccd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ ubuntu-dev-tools (0.142) UNRELEASED; urgency=low
   * pbuilder-dist: improve bash_completion for *.dsc files. Thanks Maarten
     Bezemer. (Closes: #670924, LP: #770529)
   * check-mir, check-symbols, grep-merges, pbuilder-dist-simple,
-    submittodebian, ubuntu-iso: Do enough argument parsing to handle --help
-    (LP: #988009)
+    setup-packaging-environment, submittodebian, ubuntu-iso:
+    Do enough argument parsing to handle --help (LP: #988009)
 
  -- Stefano Rivera <stefanor@debian.org>  Wed, 25 Apr 2012 17:38:58 +0200
 
diff --git a/setup-packaging-environment b/setup-packaging-environment
index 2144011..dce699c 100755
--- a/setup-packaging-environment
+++ b/setup-packaging-environment
@@ -37,6 +37,31 @@ await_response() {
     echo
 }
 
+usage() {
+    prog=$(basename $0)
+    cat <<EOF
+Usage: $prog [options]
+
+Configure your machine for packaging work
+
+Options:
+  -h, --help  show this help message and exit
+EOF
+   exit $1
+}
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -h|--help)
+            usage 0
+            ;;
+        *)
+            usage 1
+            ;;
+    esac
+    shift
+done
+
 # ##################################################################
 
 if [ "$(lsb_release -is)" != "Ubuntu" ]
diff --git a/ubuntutools/test/test_help.py b/ubuntutools/test/test_help.py
index f3bfb67..819630c 100644
--- a/ubuntutools/test/test_help.py
+++ b/ubuntutools/test/test_help.py
@@ -24,9 +24,6 @@ import setup
 from ubuntutools import subprocess
 from ubuntutools.test import unittest
 
-BLACKLIST = {
-    'setup-packaging-environment': 'Throws Error',
-}
 TIMEOUT = 5
 
 def load_tests(loader, tests, pattern):
@@ -45,9 +42,6 @@ class HelpTestCase(unittest.TestCase):
     @classmethod
     def make_help_tester(cls, script):
         def tester(self):
-            if script in BLACKLIST:
-                raise unittest.SkipTest("Blacklisted: " + BLACKLIST[script])
-
             null = open('/dev/null', 'r')
             process = subprocess.Popen(['./' + script, '--help'],
                                        close_fds=True, stdin=null,