[Python-modules-commits] [celery] 02/03: merge patched into master

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository celery.

commit b165ef4afb77ff770a83b132da6d94f04befa111
Merge: 330fce1 fe0a322
Author: Brian May <bam at debian.org>
Date:   Thu Mar 30 07:20:14 2017 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0008-Remove-bashisms-from-initd-scripts.patch  | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 extra/generic-init.d/celerybeat                    |  9 +++-
 extra/generic-init.d/celeryd                       |  7 ++-
 5 files changed, 69 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 60cc778,0000000..a2eb396
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 8af58d646c13cbd52374f855d522f48b580b3089
- 8af58d646c13cbd52374f855d522f48b580b3089
++fe0a322f110f182dc98d703815d17663fa5ac893
++fe0a322f110f182dc98d703815d17663fa5ac893
 +6753277798b7b79fec667e858b4cbf459c1c277c
 +6753277798b7b79fec667e858b4cbf459c1c277c
 +celery_3.1.23.orig.tar.gz
 +4c51da2190dee77e723b658a939809fd74f4da96
 +1310624
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-Remove-bashisms-from-initd-scripts.patch
index 0000000,0000000..c7b10ea
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch
@@@ -1,0 -1,0 +1,53 @@@
++From fe0a322f110f182dc98d703815d17663fa5ac893 Mon Sep 17 00:00:00 2001
++From: Ask Solem <ask at celeryproject.org>
++Date: Mon, 23 May 2016 13:45:39 -0700
++Subject: Remove bashisms from initd scripts
++
++Patch from
++https://github.com/celery/celery/commit/44c0ebf9c46406988e5002f8a78aa2dd506451d6
++---
++ extra/generic-init.d/celerybeat | 9 +++++++--
++ extra/generic-init.d/celeryd    | 7 ++++++-
++ 2 files changed, 13 insertions(+), 3 deletions(-)
++
++diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
++index 78aa25a..a1596a3 100755
++--- a/extra/generic-init.d/celerybeat
+++++ b/extra/generic-init.d/celerybeat
++@@ -33,9 +33,14 @@ if [ $(id -u) -ne 0 ]; then
++     exit 1
++ fi
++ 
+++origin_is_runlevel_dir () {
+++    set +e
+++    dirname $0 | grep -q "/etc/rc.\.d"
+++    echo $?
+++}
++ 
++-# May be a runlevel symlink (e.g. S02celeryd)
++-if [ -L "$0" ]; then
+++# Can be a runlevel symlink (e.g. S02celeryd)
+++if [ $(origin_is_runlevel_dir) -eq 0 ]; then
++     SCRIPT_FILE=$(readlink "$0")
++ else
++     SCRIPT_FILE="$0"
++diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
++index 7ad4599..d88e029 100755
++--- a/extra/generic-init.d/celeryd
+++++ b/extra/generic-init.d/celeryd
++@@ -41,9 +41,14 @@ if [ $(id -u) -ne 0 ]; then
++     exit 1
++ fi
++ 
+++origin_is_runlevel_dir () {
+++    set +e
+++    dirname $0 | grep -q "/etc/rc.\.d"
+++    echo $?
+++}
++ 
++ # Can be a runlevel symlink (e.g. S02celeryd)
++-if [[ `dirname $0` == /etc/rc*.d ]]; then
+++if [ $(origin_is_runlevel_dir) -eq 0 ]; then
++     SCRIPT_FILE=$(readlink "$0")
++ else
++     SCRIPT_FILE="$0"
diff --cc debian/patches/series
index 5663167,0000000..4276c96
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +drop_downgrade.patch
 +lsb-init.patch
 +intersphinx.patch
 +disable_unstable_tests.patch
 +privacy.patch
 +0006-ci-Tests-passing-on-Python-3.5.patch
 +0007-Set-shell-in-su-invocation.patch
++0008-Remove-bashisms-from-initd-scripts.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery.git