[SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk

[pmuldoon@sourceware.org]

The branch, master has been updated
       via  afccca1009fdea92c30ebc3a34227045daa6d929 (commit)
       via  baa1c43a2327ef44189fc18bfbc68a7155843b29 (commit)
      from  61c0f2d4090b4e683195cd530fb9ce4eef33c9b6 (commit)

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

- Log -----------------------------------------------------------------
commit afccca1009fdea92c30ebc3a34227045daa6d929
Merge: baa1c43a2327ef44189fc18bfbc68a7155843b29 61c0f2d4090b4e683195cd530fb9ce4eef33c9b6
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Fri Nov 16 14:59:27 2007 +0000

    Merge branch 'master' of ssh://sources.redhat.com/git/frysk

commit baa1c43a2327ef44189fc18bfbc68a7155843b29
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Fri Nov 16 14:59:01 2007 +0000

    Correct previous commit 8 space indention.

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

Summary of changes:
 frysk-core/frysk/bindir/fhpd.java |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/fhpd.java b/frysk-core/frysk/bindir/fhpd.java
index 167adde..f065cef 100644
--- a/frysk-core/frysk/bindir/fhpd.java
+++ b/frysk-core/frysk/bindir/fhpd.java
@@ -110,19 +110,18 @@ public class fhpd
       
     };
     
-    parser.add(new Option("noexe", 
-				" Do not attempt to read an executable for a corefile") {
-			public void parsed(String exeValue) throws OptionException {
-				try {
-					noExe = true;
-
-				} catch (IllegalArgumentException e) {
-					throw new OptionException("Invalid noexe parameter "
-							+ exeValue);
-				}
-
-			}
-		});
+    parser.add(new Option("noexe", "Do not attempt to read an"+
+	" executable for a corefile ") {
+	public void parsed(String exeValue) throws OptionException {
+	  try {
+	    noExe = true;
+	    
+	  } catch (IllegalArgumentException e) {
+	    throw new OptionException("Invalid noexe parameter "
+				      + exeValue);
+	  }
+	}
+      });
     parser.setHeader("Usage: fhpd <PID> || fhpd <COREFILE> [<EXEFILE>]");
     parser.parse(args);
     
@@ -138,9 +137,9 @@ public class fhpd
       else if (core != null) {
 	  line = "core " + core.getCanonicalPath();      
 	  if (exeFile != null)
-	      line += " " + exeFile.getCanonicalPath();
+	    line += " " + exeFile.getCanonicalPath();
 	  else if (noExe)
-		  line +=" -noexe";
+	    line +=" -noexe";
       }
     }
     catch (IOException ignore) {}


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