diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-07-11 08:18:55 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-07-11 08:18:55 +0900 |
| commit | 565f7f820eda5b52a5607cd820c852a09541b6e0 (patch) | |
| tree | ed6978a730fa4dc9addc38701e62a116a2f1d4bd | |
| parent | 14d560999238369c4fda3abab3334b0925f30f36 (diff) | |
| parent | d8a432a79ee9550c3f62703d36f8cddabc9c0bed (diff) | |
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Fix transitive load of GWT_PLUGIN_DEPS for in-tree plugin builds
Bazel: Move PLUGIN_DEPS_NEVERLINK declaration to plugin.bzl
Adapt gerrit.sh script to work on Alpine Linux
Change-Id: Ica5ef5b8ff76c43515ca58e4bce13bee5c341d68
| -rwxr-xr-x | resources/com/google/gerrit/pgm/init/gerrit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/com/google/gerrit/pgm/init/gerrit.sh b/resources/com/google/gerrit/pgm/init/gerrit.sh index 23f86eef36..6da1f8d545 100755 --- a/resources/com/google/gerrit/pgm/init/gerrit.sh +++ b/resources/com/google/gerrit/pgm/init/gerrit.sh @@ -63,7 +63,7 @@ test $# -gt 0 || usage running() { test -f $1 || return 1 PID=`cat $1` - ps -p $PID >/dev/null 2>/dev/null || return 1 + ps -o pid | grep -w $PID >/dev/null 2>/dev/null || return 1 return 0 } |