[maven-debian-helper] 02/05: Removed the ambiguous short option for mh_resolve_dependencies --non-explore (Closes: #826422)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit 0a613e51fdf8e0553d88890c9b3f201c0bfabca4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 27 19:44:56 2016 +0200

    Removed the ambiguous short option for mh_resolve_dependencies --non-explore (Closes: #826422)
---
 bin/mh_resolve_dependencies | 6 +++---
 debian/changelog            | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/mh_resolve_dependencies b/bin/mh_resolve_dependencies
index 3285f34..0b74112 100644
--- a/bin/mh_resolve_dependencies
+++ b/bin/mh_resolve_dependencies
@@ -26,7 +26,7 @@ syntax()
    echo -e "\t  compatibility."
    echo -e "\t-v --verbose: show more information while running"
    echo -e "\t-b --base-directory: path to root directory of package"
-   echo -e "\t-n --non-explore: doesn't explore directories for pom.xml"
+   echo -e "\t   --non-explore: doesn't explore directories for pom.xml"
    echo -e ""
    echo -e "Description:"
    echo -e "This tool reads the POM files defined in debian/$package.poms"
@@ -42,7 +42,7 @@ syntax()
    exit 1
 }
 
-ARGS="p package a ant d javadoc v verbose n non-interactive o offline b base-directory n non-explore" parseargs "$@"
+ARGS="p package a ant d javadoc v verbose n non-interactive o offline b base-directory non-explore" parseargs "$@"
 
 PACKAGE=$(getarg p package)
 ANT=$(getarg a ant)
@@ -51,7 +51,7 @@ NON_INTERACTIVE=$(getarg n non-interactive)
 OFFLINE=$(getarg o offline)
 VERBOSE=$(getarg v verbose)
 BASE_DIR=$(getarg b base-directory)
-NON_EXPLORE=$(getarg n non-explore)
+NON_EXPLORE=$(getarg non-explore)
 
 if [ -z "$PACKAGE" ]; then
     if [ "$ARGC" -gt "0" ]; then
diff --git a/debian/changelog b/debian/changelog
index 8d0a7af..25e8560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ maven-debian-helper (2.0.7) UNRELEASED; urgency=medium
   * Standards-Version updated to 3.9.8
   * The generated control file now specifies Standards-Version: 3.9.8
   * Fixed the default license announced by mh_make (Closes: #826419)
+  * Removed the ambiguous short option for mh_resolve_dependencies --non-explore
+    (Closes: #826422)
 
   [ Christopher Hoskin ]
   * Fix "mh_resolve_dependencies fails to honour --verbose option" 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git