ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-27 07:01:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

corrected service condition

Browse source
This commit is contained in:
Brian Coca 2017-01-09 15:44:37 -05:00
commit afbe3bd63f
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -48,8 +48,10 @@ endif
ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1) ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1)
DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M) DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M)
CPUS := $(shell sysctl hw.ncpu|awk '{print $2}')
else else
DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M) DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
CPUS := $(shell nproc)
endif endif
# DEB build parameters # DEB build parameters

2
lib/ansible/modules/system/service.py
View file

@ -626,7 +626,7 @@ class LinuxService(Service):
if "stop" in cleanout: if "stop" in cleanout:
self.running = False self.running = False
elif "run" in cleanout: elif "run" in cleanout:
self.running = ("not " in cleanout) self.running = not ("not " in cleanout)
elif "start" in cleanout and "not " not in cleanout: elif "start" in cleanout and "not " not in cleanout:
self.running = True self.running = True
elif 'could not access pid file' in cleanout: elif 'could not access pid file' in cleanout: