[Python-modules-commits] [celery] 04/13: Refresh patches for 4.1.0.

[Michael Fladischer]

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

fladi pushed a commit to branch debian/master
in repository celery.

commit f626e60373313efc3952c1f303587c8ae477d4e6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Jul 31 10:06:07 2017 +0200

    Refresh patches for 4.1.0.
---
 debian/changelog                                    |  1 +
 ...-Make-appstr-use-standard-format-4134-4139.patch | 21 ---------------------
 .../patches/0007-Set-shell-in-su-invocation.patch   |  4 ++--
 debian/patches/lsb-init.patch                       |  4 ++--
 debian/patches/series                               |  1 -
 5 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e32057b..17b46d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ celery (4.0.2-1) UNRELEASED; urgency=medium
 
   [ Michael Fladischer ]
   * Add new upstream signing key.
+  * Refresh patches for 4.1.0.
 
  -- Brian May <bam at debian.org>  Tue, 04 Jul 2017 08:05:58 +1000
 
diff --git a/debian/patches/0004-Make-appstr-use-standard-format-4134-4139.patch b/debian/patches/0004-Make-appstr-use-standard-format-4134-4139.patch
deleted file mode 100644
index 46dbeb4..0000000
--- a/debian/patches/0004-Make-appstr-use-standard-format-4134-4139.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Preston Moore <prestonkmoore at gmail.com>
-Date: Tue, 18 Jul 2017 06:46:15 -0400
-Subject: Make appstr use standard format (#4134) (#4139)
-
----
- celery/app/utils.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/celery/app/utils.py b/celery/app/utils.py
-index 75c88aa..32aaf44 100644
---- a/celery/app/utils.py
-+++ b/celery/app/utils.py
-@@ -70,7 +70,7 @@ FMT_REPLACE_SETTING = '{replace:<36} -> {with_}'
- 
- def appstr(app):
-     """String used in __repr__ etc, to id app instances."""
--    return '{0}:{1:#x}'.format(app.main or '__main__', id(app))
-+    return '{0} at {1:#x}'.format(app.main or '__main__', id(app))
- 
- 
- class Settings(ConfigurationView):
diff --git a/debian/patches/0007-Set-shell-in-su-invocation.patch b/debian/patches/0007-Set-shell-in-su-invocation.patch
index 652e898..f160d78 100644
--- a/debian/patches/0007-Set-shell-in-su-invocation.patch
+++ b/debian/patches/0007-Set-shell-in-su-invocation.patch
@@ -10,7 +10,7 @@ http://bugs.debian.org/824786
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
-index ee4c595..20d69a2 100755
+index fc14ce1..75a680c 100755
 --- a/extra/generic-init.d/celerybeat
 +++ b/extra/generic-init.d/celerybeat
 @@ -261,7 +261,7 @@ stop_beat () {
@@ -23,7 +23,7 @@ index ee4c595..20d69a2 100755
  
  start_beat () {
 diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
-index e7b5564..54dc536 100755
+index 67dd55d..e2fa152 100755
 --- a/extra/generic-init.d/celeryd
 +++ b/extra/generic-init.d/celeryd
 @@ -257,7 +257,7 @@ _get_pids() {
diff --git a/debian/patches/lsb-init.patch b/debian/patches/lsb-init.patch
index 42c1f44..cabca90 100644
--- a/debian/patches/lsb-init.patch
+++ b/debian/patches/lsb-init.patch
@@ -15,7 +15,7 @@ Patch-Name: lsb-init.patch
  2 files changed, 23 insertions(+)
 
 diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
-index 08c815b..ee4c595 100755
+index 8f97790..fc14ce1 100755
 --- a/extra/generic-init.d/celerybeat
 +++ b/extra/generic-init.d/celerybeat
 @@ -15,11 +15,15 @@
@@ -57,7 +57,7 @@ index 08c815b..ee4c595 100755
  CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
  CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
 diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
-index de55414..e7b5564 100755
+index 1636619..67dd55d 100755
 --- a/extra/generic-init.d/celeryd
 +++ b/extra/generic-init.d/celeryd
 @@ -16,6 +16,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 4313fe2..d617195 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 lsb-init.patch
 privacy.patch
 0007-Set-shell-in-su-invocation.patch
-0004-Make-appstr-use-standard-format-4134-4139.patch

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