[interchange-cvs] interchange - racke modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Sat Sep 25 05:43:47 EDT 2004


User:      racke
Date:      2004-09-25 09:43:47 GMT
Modified:  .        WHATSNEW-5.3
Modified:  lib/Vend Control.pm
Log:
Controlling Interchange (add,remove,jobs) doesn't stop despite of a
stale PID file and kills the script it runs from (Debian bug #256093)

Revision  Changes    Path
2.14      +3 -0      interchange/WHATSNEW-5.3


rev 2.14, prev_rev 2.13
Index: WHATSNEW-5.3
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.3,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -r2.13 -r2.14
--- WHATSNEW-5.3	21 Sep 2004 15:07:28 -0000	2.13
+++ WHATSNEW-5.3	25 Sep 2004 09:43:47 -0000	2.14
@@ -56,6 +56,9 @@
 
 * Add table to [import] error message.
 
+* Controlling Interchange (add,remove,jobs) doesn't stop despite of a 
+  stale PID file and kills the script it runs from (Debian bug #256093)
+
 UI
 --
 



2.11      +3 -2      interchange/lib/Vend/Control.pm


rev 2.11, prev_rev 2.10
Index: Control.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Control.pm,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- Control.pm	31 Jul 2003 19:33:40 -0000	2.10
+++ Control.pm	25 Sep 2004 09:43:47 -0000	2.11
@@ -1,6 +1,6 @@
 # Vend::Control - Routines that alter the running Interchange daemon
 # 
-# $Id: Control.pm,v 2.10 2003/07/31 19:33:40 racke Exp $
+# $Id: Control.pm,v 2.11 2004/09/25 09:43:47 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -111,7 +111,8 @@
 The previous Interchange server was not running and probably
 terminated with an error.
 EOF
-		return if $restart;
+		exit 1 unless $restart;
+		return;
 	}
 	if(! $sig) {
 		$sig = $mode ne 'kill' ? 'TERM' : 'KILL';








More information about the interchange-cvs mailing list