rpms/frysk/devel frysk-0.4-taskstoperr.patch, NONE, 1.1 frysk.spec, 1.160, 1.161

cagney cagney at fedoraproject.org
Mon Mar 29 23:49:21 UTC 2010


Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25270/devel

Modified Files:
	frysk.spec 
Added Files:
	frysk-0.4-taskstoperr.patch 
Log Message:
* Mon Mar 29 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-23
- for fexe et.al., exit cleanly when an error -
  frysk-0.4-taskstoperr.patch


frysk-0.4-taskstoperr.patch:
 TaskStopUtil.java |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE frysk-0.4-taskstoperr.patch ---
diff -up frysk-0.4/frysk-core/frysk/util/TaskStopUtil.java.taskstoperr frysk-0.4/frysk-core/frysk/util/TaskStopUtil.java
--- frysk-0.4/frysk-core/frysk/util/TaskStopUtil.java.taskstoperr	2010-03-29 19:28:34.000000000 -0400
+++ frysk-0.4/frysk-core/frysk/util/TaskStopUtil.java	2010-03-29 19:40:05.000000000 -0400
@@ -113,6 +113,11 @@ public class TaskStopUtil {
 	parser.setHeader(usage);
     }
     
+    /**
+     * The final result, assume ok, set to +ve if thigns go wrong.
+     */
+    private static int status = 0;
+
     public void execute () {
 	parser.parse(args);
 
@@ -121,6 +126,7 @@ public class TaskStopUtil {
 	    System.err.println("ERROR: No argument provided.");
 	    parser.printHelp();
 	}
+	System.exit(status);
     }
     
     private static class TasksBlocked implements ProcBlockObserver, Event {
@@ -136,7 +142,12 @@ public class TaskStopUtil {
 
 	public void allExistingTasksCompleted() {
 	    fine.log("allExistingTasksCompleted proc", proc);
-	    procEvent.executeLive(proc);
+	    try {
+		procEvent.executeLive(proc);
+	    } catch (frysk.UserException e) {
+		System.err.println("error: " + e.getMessage());
+		status = 1;
+	    }
 	    // Now ask for it to be detached.
 	    proc.requestAbandonAndRunEvent(this);
 	}


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- frysk.spec	29 Mar 2010 21:46:22 -0000	1.160
+++ frysk.spec	29 Mar 2010 23:49:21 -0000	1.161
@@ -1,7 +1,7 @@
 Summary:	Execution analysis and debugging tool-suite.
 Name:		frysk
 Version:	0.4
-Release:	22%{?dist}
+Release:	23%{?dist}
 
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # getopt is GPLv2 with exception
@@ -31,6 +31,7 @@ Patch8:		frysk-0.4-taskstoputil.patch
 Patch9:		frysk-0.4-publictestbedsymtab.patch
 Patch10:	frysk-0.4-noelfmem.patch
 Patch11:	frysk-0.4-gccjint.patch
+Patch12:	frysk-0.4-taskstoperr.patch
 
 Patch100:	frysk-0.4-aclocaljavac.patch
 
@@ -159,6 +160,7 @@ mv frysk-core/frysk/util/ProcStopUtil.ja
 %patch9 -p1 -z .publictestbedsymtab
 %patch10 -p1 -z .noelfmem
 %patch11 -p1 -z .gccjint
+%patch12 -p1 -z .taskstoperr
 
 %if %{fedora}0 >= 130
 %patch100 -p1 -z .aclocaljavac
@@ -350,8 +352,13 @@ rm -rf %{buildroot}
 %{_mandir}/man1/frysk.1.gz
 
 %changelog
+* Mon Mar 29 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-23
+- for fexe et.al., exit cleanly when an error -
+  frysk-0.4-taskstoperr.patch
+
 * Mon Mar 29 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-22
-- Work around gcc bug where MAX_INT+1 isn't -ve - gccjint.patch.
+- work around gcc bug where MAX_INT+1 isn't -ve -
+  frsyk-0.4-gccjint.patch
 
 * Thu Mar 25 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-21
 - Merge 0.145 elfutils and local fixes.  This is Plan B, Plan A was to



More information about the scm-commits mailing list