From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10696 invoked by alias); 18 Apr 2008 17:40:39 -0000 Received: (qmail 10665 invoked by uid 9519); 18 Apr 2008 17:40:38 -0000 Date: Fri, 18 Apr 2008 17:40:00 -0000 Message-ID: <20080418174038.10650.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix problem created with TestSysRoot. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 6fb55aebf463508ccb51e4eca557acad94e1fe4e X-Git-Newrev: 48a7edfa2a0699f311d3a16d174b3338ad87f4d6 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-q2/txt/msg00139.txt.bz2 The branch, master has been updated via 48a7edfa2a0699f311d3a16d174b3338ad87f4d6 (commit) from 6fb55aebf463508ccb51e4eca557acad94e1fe4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 48a7edfa2a0699f311d3a16d174b3338ad87f4d6 Author: Rick Moseley Date: Fri Apr 18 12:39:37 2008 -0500 Fix problem created with TestSysRoot. * StartRun.java: Fix bug in TestSysRoot introduced by yesterday's changes. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 5 +++++ frysk-core/frysk/hpd/StartRun.java | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index c133bcc..aca7b70 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,8 @@ +2008-04-18 Rick Moseley + + * StartRun.java: Fix bug in TestSysRoot introduced by + yesterday's changes. + 2008-04-17 Rick Moseley * StartRun.java: Add args to multiple runs for start/run diff --git a/frysk-core/frysk/hpd/StartRun.java b/frysk-core/frysk/hpd/StartRun.java index c5855a2..0fd6eac 100644 --- a/frysk-core/frysk/hpd/StartRun.java +++ b/frysk-core/frysk/hpd/StartRun.java @@ -132,7 +132,6 @@ abstract class StartRun extends ParameterizedCommand { public void interpretCmd(CLI cli, Input cmd, Object options, boolean runToBreak) { - userSet = cli.getCommandPTSet(cmd); // See if there are any tasks to be killed if (killProcs(cli)) { @@ -256,9 +255,12 @@ abstract class StartRun extends ParameterizedCommand { } else { String[] temp = new String[1]; - temp [0] = argList[0]; + if (command != "" || command != null) + temp[0] = command; + else + temp [0] = argList[0]; cli.addMessage(startrun + " with this commmand: " + - asString("", temp, cmd), Message.TYPE_NORMAL); + asString(command, temp, cmd), Message.TYPE_NORMAL); Manager.host.requestCreateAttachedProc(createArgList(null, temp), runner); } break; hooks/post-receive -- frysk system monitor/debugger