[Python-modules-commits] r32735 - in packages/celery/trunk/debian/patches (lsb-init.patch)

[fladi-guest at users.alioth.debian.org]

    Date: Wednesday, May 20, 2015 @ 13:38:15
  Author: fladi-guest
Revision: 32735

Source /lib/lsb/init-functions in all init scripts.

Modified:
  packages/celery/trunk/debian/patches/lsb-init.patch

Modified: packages/celery/trunk/debian/patches/lsb-init.patch
===================================================================
--- packages/celery/trunk/debian/patches/lsb-init.patch	2015-05-20 13:36:25 UTC (rev 32734)
+++ packages/celery/trunk/debian/patches/lsb-init.patch	2015-05-20 13:38:15 UTC (rev 32735)
@@ -6,9 +6,11 @@
 Last-Update: 2013-09-03
 Forwarded: no
 
---- a/extra/generic-init.d/celerybeat
-+++ b/extra/generic-init.d/celerybeat
-@@ -15,6 +15,7 @@
+Index: celery/extra/generic-init.d/celerybeat
+===================================================================
+--- celery.orig/extra/generic-init.d/celerybeat	2015-05-20 15:30:12.006150137 +0200
++++ celery/extra/generic-init.d/celerybeat	2015-05-20 15:37:34.874907174 +0200
+@@ -15,11 +15,15 @@
  # Default-Start:     2 3 4 5
  # Default-Stop:      0 1 6
  # Short-Description: celery periodic task scheduler
@@ -16,15 +18,23 @@
  ### END INIT INFO
  
  # Cannot use set -e/bash -e since the kill -0 command will abort
-@@ -85,6 +86,7 @@
+ # abnormally in the absence of a valid process ID.
+ #set -e
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
  
+@@ -85,6 +89,7 @@
+ 
  scripts=""
  
 +
  if test -f /etc/default/celeryd; then
      scripts="/etc/default/celeryd"
      _config_sanity /etc/default/celeryd
-@@ -106,6 +108,13 @@
+@@ -106,6 +111,13 @@
  DEFAULT_LOG_FILE="/var/log/celery/beat.log"
  DEFAULT_LOG_LEVEL="INFO"
  DEFAULT_CELERYBEAT="$CELERY_BIN beat"
@@ -38,8 +48,10 @@
  
  CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
  CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
---- a/extra/generic-init.d/celeryd
-+++ b/extra/generic-init.d/celeryd
+Index: celery/extra/generic-init.d/celeryd
+===================================================================
+--- celery.orig/extra/generic-init.d/celeryd	2015-05-20 15:30:12.006150137 +0200
++++ celery/extra/generic-init.d/celeryd	2015-05-20 15:37:38.186972640 +0200
 @@ -16,6 +16,7 @@
  # Default-Start:     2 3 4 5
  # Default-Stop:      0 1 6
@@ -48,7 +60,17 @@
  ### END INIT INFO
  #
  #
-@@ -52,6 +53,7 @@
+@@ -28,6 +29,9 @@
+ #
+ # You can then configure this by manipulating /etc/default/little-worker.
+ #
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
+ if [ $(id -u) -ne 0 ]; then
+@@ -52,6 +56,7 @@
  DEFAULT_LOG_LEVEL="INFO"
  DEFAULT_NODES="celery"
  DEFAULT_CELERYD="-m celery worker --detach"
@@ -56,7 +78,7 @@
  
  CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"}
  
-@@ -104,6 +106,12 @@
+@@ -104,6 +109,12 @@
      . "$CELERY_DEFAULTS"
  fi