Kaydet (Commit) 62df5aab authored tarafından Stephan Bergmann's avatar Stephan Bergmann

gdb-core-bt.sh expects three arguments now

...since 29b59f2e "gdb-core-bt: don't talk about
core files without a reason."

Change-Id: I45640a5724fd98faf3a7c1e44e904f880cc9fc6a
üst a604a495
...@@ -104,6 +104,7 @@ public final class OfficeConnection { ...@@ -104,6 +104,7 @@ public final class OfficeConnection {
throws InterruptedException, com.sun.star.uno.Exception throws InterruptedException, com.sun.star.uno.Exception
{ {
boolean cleanTermination = false; boolean cleanTermination = false;
int code = 0;
try { try {
boolean desktopTerminated = true; boolean desktopTerminated = true;
if (process != null) { if (process != null) {
...@@ -140,7 +141,6 @@ public final class OfficeConnection { ...@@ -140,7 +141,6 @@ public final class OfficeConnection {
process.destroy(); process.destroy();
} }
} }
int code = 0;
if (process != null) { if (process != null) {
code = process.waitFor(); code = process.waitFor();
} }
...@@ -165,7 +165,7 @@ public final class OfficeConnection { ...@@ -165,7 +165,7 @@ public final class OfficeConnection {
ProcessBuilder pb = new ProcessBuilder( ProcessBuilder pb = new ProcessBuilder(
postprocesscommand, postprocesscommand,
sofficeArg.substring("path:".length()) + ".bin", sofficeArg.substring("path:".length()) + ".bin",
workdir); workdir, String.valueOf(code));
Process postprocess = pb.start(); Process postprocess = pb.start();
Forward ppoutForward = new Forward( Forward ppoutForward = new Forward(
postprocess.getInputStream(), System.out); postprocess.getInputStream(), System.out);
...@@ -173,7 +173,7 @@ public final class OfficeConnection { ...@@ -173,7 +173,7 @@ public final class OfficeConnection {
Forward pperrForward = new Forward( Forward pperrForward = new Forward(
postprocess.getErrorStream(), System.err); postprocess.getErrorStream(), System.err);
pperrForward.start(); pperrForward.start();
int code = postprocess.waitFor(); code = postprocess.waitFor();
if (code != 0) { if (code != 0) {
throw new PostprocessFailedException(code); throw new PostprocessFailedException(code);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment