From 93056a4cda0df46c92702590ec7576e182329b8c Mon Sep 17 00:00:00 2001 From: "gyeongseok.seo" Date: Mon, 7 Jan 2013 11:01:12 +0900 Subject: [PATCH] [Title] Fixed help not printed bug [Desc.] help page is not printed [Issue] 7958 Change-Id: I711ac3c1a216c2360964b014462f2b6cf4978edf --- .../src/org/tizen/cli/exec/AbstractLauncher.java | 17 +++++++++++++++-- package/changelog | 3 +++ package/pkginfo.manifest | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/org.tizen.cli/src/org/tizen/cli/exec/AbstractLauncher.java b/org.tizen.cli/src/org/tizen/cli/exec/AbstractLauncher.java index 22bb50e..7badf50 100755 --- a/org.tizen.cli/src/org/tizen/cli/exec/AbstractLauncher.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/AbstractLauncher.java @@ -372,7 +372,20 @@ AbstractLauncher logger.error( "Parsing Error: ", e ); logger.trace( "Invalid usage." ); - printError( e.getMessage() ); + + // args include "-h, --help" then working 'help' + boolean bPrintHelp = false; + for ( String arg : args ) { + if ( OPT_HELP.substring( 0, 1 ).equals( arg ) || ( "--" + OPT_HELP ).equals( arg ) ) { + printHelp(); + bPrintHelp = true; + break; + } + } + + if ( !bPrintHelp ) { + printError( e.getMessage() ); + } if ( null != cmd ) { logger.debug( "Help argument :{}", cmd.getArgList() ); @@ -444,7 +457,7 @@ AbstractLauncher final CommandLineParser parser = getParser(); final Options options = getOptions(); - + final CommandLine cmdLine = parser.parse( options, args ); return cmdLine; diff --git a/package/changelog b/package/changelog index 3867588..1609786 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 1.0.52 +- modified CLI's help not printed bug +== gyeongseok.seo 2013-01-07 * 1.0.51 - modified CLI's usage print contents == gyeongseok.seo 2013-01-03 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 9a47b87..d6c6d76 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:1.0.51 +Version:1.0.52 Maintainer: Bon-Yong Lee, gyeongseok seo Package: web-cli -- 2.7.4