Changeset 447 for CMT/HEAD

Timestamp:

Feb 23, 2008, 12:01:16 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 351

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/constituent_lock (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-02-23    <rybkin@lal.in2p3.fr> 351
+        
+        * mgr/fragments/constituent_lock: Remove the lockfile on receipt of signal HUP, INT, TERM
+        (1, 2, 15)
+        
 2008-02-22    <rybkin@lal.in2p3.fr> 350
         

CMT/HEAD/mgr/fragments/constituent_lock

@@ -57 +57 @@
 
 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
-        $(echo) "(constituents.make) Creating ${CONSTITUENT}${lock_suffix}"
-        @${lock_command} ${CONSTITUENT}${lock_suffix}
-        $(echo) "(constituents.make) Starting ${CONSTITUENT}"
-        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}; \
-        retval=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}
+        $(echo) "(constituents.make) Creating ${CONSTITUENT}${lock_suffix} and Starting ${CONSTITUENT}"
+        @{ ${lock_command} ${CONSTITUENT}${lock_suffix} || exit $$?; } ; \
+          retval=$$?; \
+          trap '${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}' 1 2 15; \
+          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}; \
+          retval=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}
         $(echo) "(constituents.make) ${CONSTITUENT} done"