From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14187 invoked by alias); 10 Jan 2008 16:54:47 -0000 Received: (qmail 14153 invoked by uid 9514); 10 Jan 2008 16:54:46 -0000 Date: Thu, 10 Jan 2008 16:54:00 -0000 Message-ID: <20080110165446.14138.qmail@sourceware.org> From: pmuldoon@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Print option help if Commands are 1 or more, not more than 1. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 87bc11379df13e358e67a9c37206c3d52f13a5eb X-Git-Newrev: dae63f3724c8a8eb9a5d92d0aa9df4bbd809ac3e Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00041.txt.bz2 The branch, master has been updated via dae63f3724c8a8eb9a5d92d0aa9df4bbd809ac3e (commit) via 75ddb8c7d72962dfd1a818a652dda27ffc62029d (commit) from 87bc11379df13e358e67a9c37206c3d52f13a5eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit dae63f3724c8a8eb9a5d92d0aa9df4bbd809ac3e Merge: 75ddb8c7d72962dfd1a818a652dda27ffc62029d 87bc11379df13e358e67a9c37206c3d52f13a5eb Author: Phil Muldoon Date: Thu Jan 10 16:54:07 2008 +0000 Print option help if Commands are 1 or more, not more than 1. 2008-01-10 Phil Muldoon * ParameterizedCommand.java (help): Print help if longCommands >0 ! >1. Seperate options from help text. Merge branch 'master' of ssh://sources.redhat.com/git/frysk commit 75ddb8c7d72962dfd1a818a652dda27ffc62029d Author: Phil Muldoon Date: Thu Jan 10 16:53:15 2008 +0000 Print out command help if there is only one option (previously > 1). 2008-01-10 Phil Muldoon * ParameterizedCommand.java (help): Print help if longCommands >0 ! >1. Seperate options from help text. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 3 +++ frysk-core/frysk/hpd/ParameterizedCommand.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 6cc7e26..8adafc8 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,5 +1,8 @@ 2008-01-10 Phil Muldoon + * ParameterizedCommand.java (help): Print help if longCommands >0 ! >1. + Seperate options from help text. + * TestRegs.java (testRegsCommand): Add general-regs * RegsCommand.java: (RegsCommand): New constructor. (interpret): Account for new constructor setting register diff --git a/frysk-core/frysk/hpd/ParameterizedCommand.java b/frysk-core/frysk/hpd/ParameterizedCommand.java index eba9dfb..0360746 100644 --- a/frysk-core/frysk/hpd/ParameterizedCommand.java +++ b/frysk-core/frysk/hpd/ParameterizedCommand.java @@ -144,8 +144,8 @@ abstract class ParameterizedCommand extends Command { void help(CLI cli, Input input) { cli.outWriter.print(syntax); - if (longOptions.size() > 1) { - cli.outWriter.print(" -option ...; where options are:"); + if (longOptions.size() > 0) { + cli.outWriter.println(" -option ...; where options are:"); for (Iterator i = longOptions.values().iterator(); i.hasNext(); ) { CommandOption option = (CommandOption)i.next(); hooks/post-receive -- frysk system monitor/debugger