public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: scox@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM]  master: Merge branch 'master' of ssh://sourceware.org/git/frysk
Date: Sat, 19 Apr 2008 00:32:00 -0000	[thread overview]
Message-ID: <20080419003256.32190.qmail@sourceware.org> (raw)

The branch, master has been updated
       via  52ced09bbfafaaf25f6b8d281797a0bd2fc7683a (commit)
       via  73d282bf3a5fcd53f93fefa656a5147241eea314 (commit)
      from  7818efc4183ec591a9272ec46b31b01e34b07ab8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 52ced09bbfafaaf25f6b8d281797a0bd2fc7683a
Merge: 73d282bf3a5fcd53f93fefa656a5147241eea314 7818efc4183ec591a9272ec46b31b01e34b07ab8
Author: Stan Cox <scox@redhat.com>
Date:   Fri Apr 18 20:32:37 2008 -0400

    Merge branch 'master' of ssh://sourceware.org/git/frysk

commit 73d282bf3a5fcd53f93fefa656a5147241eea314
Author: Stan Cox <scox@redhat.com>
Date:   Fri Apr 18 20:29:47 2008 -0400

    Use SysRootCache if we don't have the ExeFile.
    
    * Host.java (requestCreateAttachedProc): If unable to use getExeFile
    to get SysRoot then use SysRootCache.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/proc/ChangeLog |    5 +++++
 frysk-core/frysk/proc/Host.java |    9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 2861790..77cafc4 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-18  Stan Cox  <scox@redhat.com>
+
+	* Host.java (requestCreateAttachedProc): If unable to use getExeFile
+	to get SysRoot then use SysRootCache.
+
 2008-04-17  Andrew Cagney  <cagney@redhat.com>
 
 	* StressAttachDetachSignaledTask.java: Use frysk.config.Prefix.
diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java
index dda263c..ad05c6f 100644
--- a/frysk-core/frysk/proc/Host.java
+++ b/frysk-core/frysk/proc/Host.java
@@ -43,6 +43,7 @@ import java.io.File;
 import java.util.Collection;
 import frysk.rsl.Log;
 import frysk.sysroot.SysRoot;
+import frysk.sysroot.SysRootCache;
 import frysk.sysroot.SysRootFile;
 
 /**
@@ -102,8 +103,10 @@ public abstract class Host implements Comparable {
 					  TaskAttachedObserverXXX attachedObserver) {
 	fine.log(this, "requestCreateAttachedProc", args, "observer",
 		 attachedObserver);
+	SysRoot sysRoot = new SysRoot(SysRootCache.getSysRoot(args[0]));
 	requestCreateAttachedProc(new File(args[0]), stdin, stdout, stderr,
-				  args, "", attachedObserver);
+				  args, sysRoot.getLibPathViaSysRoot(),
+				  attachedObserver);
     }
     /**
      * Request that a new attached and running process(with stdin,
@@ -113,8 +116,10 @@ public abstract class Host implements Comparable {
 					  TaskAttachedObserverXXX attachedObserver) {
 	fine.log(this, "requestCreateAttachedProc", args, "observer",
 		 attachedObserver);
+	SysRoot sysRoot = new SysRoot(SysRootCache.getSysRoot(args[0]));
 	requestCreateAttachedProc(new File(args[0]), null, null, null,
-				  args, "", attachedObserver);
+				  args, sysRoot.getLibPathViaSysRoot(),
+				  attachedObserver);
     }
     /**
      * Request that a new attached and running process based on


hooks/post-receive
--
frysk system monitor/debugger


             reply	other threads:[~2008-04-19  0:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-19  0:32 scox [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-05-29 15:51 tthomas
2008-05-07 15:23 tthomas
2007-11-27  2:15 pzhao
2007-11-20 17:23 cagney
2007-11-08 20:57 cagney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080419003256.32190.qmail@sourceware.org \
    --to=scox@sourceware.org \
    --cc=frysk-cvs@sourceware.org \
    --cc=frysk@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).