[couchdb-pkg] branch master updated (415263d -> cff98e2)

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.


 discard 415263d  Fix init.d script, closes #22
     new cff98e2  Fix init.d script, closes #22

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (415263d)
            \
             N -- N -- N   refs/heads/master (cff98e2)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/couchdb.init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wohali@apache.org.

[couchdb-pkg] 01/01: Fix init.d script, closes #22

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git

commit cff98e2d79084de91f75011459121e0cc0ee20c9
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Mon Jun 11 14:48:12 2018 -0700

    Fix init.d script, closes #22
---
 debian/couchdb.init | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/couchdb.init b/debian/couchdb.init
index 0fee249..2091dc2 100644
--- a/debian/couchdb.init
+++ b/debian/couchdb.init
@@ -44,11 +44,11 @@ do_usage() {
 }
 
 do_start_cmd() {
-    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE}} \
+    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE} --make-pidfile} \
         $START_ARGS \
         --startas $DAEMON --name $NAME --exec $DAEMON --test > /dev/null \
         || return 1
-    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE}} \
+    start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE} --make-pidfile} \
         $START_ARGS \
         --startas $DAEMON --name $NAME --exec $DAEMON -- $DAEMON_ARGS \
         || return 2
@@ -67,10 +67,11 @@ do_stop_cmd() {
     RETVAL=2
     if [ ! -z "$PID" ]; then
         start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \
-            --pid $PID
+            --pid $PIDFILE
         RETVAL="$?"
         [ "$RETVAL" = 2 ] && return 2
     fi
+    rm -f ${PIDFILE}
     return $RETVAL
 }
 

-- 
To stop receiving notification emails like this one, please contact
wohali@apache.org.