[SCM] live-studio branch, master, updated. 8a3a94741901a50e699850c095502c34f6f8a403

Chris Lamb lamby at debian.org
Sun Aug 1 04:13:35 UTC 2010


The following commit has been merged in the master branch:
commit 53a0152bfd01c4cb2aa6ab0fed3957831929439b
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 00:10:51 2010 -0400

    Ignore signals when building an image so that upgrades of queue_runner doesn't break the build

diff --git a/live_studio/build/management/commands/queue_runner.py b/live_studio/build/management/commands/queue_runner.py
index 5c05b65..7b98a32 100644
--- a/live_studio/build/management/commands/queue_runner.py
+++ b/live_studio/build/management/commands/queue_runner.py
@@ -2,6 +2,7 @@ import os
 import sys
 import time
 import shutil
+import signal
 import logging
 import datetime
 import tempfile
@@ -76,6 +77,8 @@ class Command(NoArgsCommand):
                 self.log.exception("Caught exception")
 
     def run(self):
+        signal.signal(signal.SIGTERM, signal.SIG_DFL)
+
         try:
             build = Build.objects.pop()
         except IndexError:
@@ -88,6 +91,8 @@ class Command(NoArgsCommand):
 
             return
 
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+
         def update(**kwargs):
             self.log.debug('Updating #%d with %r', build.pk, kwargs)
             Build.objects.filter(pk=build.pk).update(**kwargs)

-- 
live-studio



More information about the debian-live-changes mailing list