From 8c48f652eaafbcf0420521e911bd7a1bba831fce Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Mon, 16 Nov 2015 14:21:43 +0100
Subject: [PATCH] fix check_services

---
 .bzrignore | 23 -----------------------
 update.py  |  4 +++-
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 .bzrignore

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index a25d1874..00000000
--- a/.bzrignore
+++ /dev/null
@@ -1,23 +0,0 @@
-secret.txt
-local_settings.py
-./lib
-./include
-./src
-./bin
-./static/json/pandora.json
-./static/js/pandora.min.js
-config.jsonc
-./local
-./static/js/pandora.min.js.gz
-./static/json/*.json.gz
-./static/json/locale.??.json
-./static/oxjs
-./static/admin
-./data
-./scripts/poster.py
-./scripts/list_icon.py
-./scripts/item_icon.py
-./static/png/icon.png
-./static/png/logo.png
-._*
-static/django_extensions
diff --git a/update.py b/update.py
index 4b21db7e..b7d71d72 100755
--- a/update.py
+++ b/update.py
@@ -66,7 +66,9 @@ def check_services(base):
     services = "pandora pandora-tasks pandora-encoding pandora-cron pandora-websocketd".split()
     for service in services:
         cmd = ['service', service, 'status']
-        if subprocess.check_call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) != 0:
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p.wait()
+        if p.returncode != 0:
             print 'Please install init script for "%s" service:' % service
             if os.path.exists('/etc/init'):
                 print '\tsudo cp %s/etc/init/%s.conf /etc/init/' % (base, service)