From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30616 invoked by alias); 18 Mar 2008 16:22:45 -0000 Received: (qmail 30579 invoked by uid 9514); 18 Mar 2008 16:22:45 -0000 Date: Tue, 18 Mar 2008 16:22:00 -0000 Message-ID: <20080318162244.30564.qmail@sourceware.org> From: pmuldoon@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: caa2ca584dc1e2953dc28c277841be18c5ad99ab X-Git-Newrev: f46fb354811d6cf1262c4e0a9f8c807e18b4314e 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/msg00399.txt.bz2 The branch, master has been updated via f46fb354811d6cf1262c4e0a9f8c807e18b4314e (commit) via 35fceeeae30b2f795c0281659988f815224e42d2 (commit) from caa2ca584dc1e2953dc28c277841be18c5ad99ab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f46fb354811d6cf1262c4e0a9f8c807e18b4314e Merge: 35fceeeae30b2f795c0281659988f815224e42d2 caa2ca584dc1e2953dc28c277841be18c5ad99ab Author: Phil Muldoon Date: Tue Mar 18 16:22:31 2008 +0000 Merge branch 'master' of ssh://sources.redhat.com/git/frysk commit 35fceeeae30b2f795c0281659988f815224e42d2 Author: Phil Muldoon Date: Tue Mar 18 16:21:44 2008 +0000 Trim Sys Root help output. 2008-03-18 Phil Muldoon * CommandlineParser.java (CommandlineParser): Trim Sys Root help output. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/util/ChangeLog | 5 +++++ frysk-core/frysk/util/CommandlineParser.java | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog index 6117e12..1ddb337 100644 --- a/frysk-core/frysk/util/ChangeLog +++ b/frysk-core/frysk/util/ChangeLog @@ -1,3 +1,8 @@ +2008-03-18 Phil Muldoon + + * CommandlineParser.java (CommandlineParser): Trim + Sys Root help output. + 2008-03-17 Andrew Cagney * StacktraceAction.java: Implement ProcBlockObserver. diff --git a/frysk-core/frysk/util/CommandlineParser.java b/frysk-core/frysk/util/CommandlineParser.java index 5992092..949c061 100644 --- a/frysk-core/frysk/util/CommandlineParser.java +++ b/frysk-core/frysk/util/CommandlineParser.java @@ -84,7 +84,7 @@ public class CommandlineParser { explicitExe = exeValue; } }); - add(new Option("sysroot", "special root directory", "Path of special root directory") { + add(new Option("sysroot", "Special root directory", "") { public void parsed(String arg) throws OptionException { parseSysRoot(arg); } hooks/post-receive -- frysk system monitor/debugger