summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-19 08:25:36 -0700
committerChris McDonough <chrism@plope.com>2012-08-19 08:25:36 -0700
commit0bdaa91fb2407f98e490aa16b52f4a825e9914d1 (patch)
tree41e8220fb97544f7feaecbd4c76e787fde069644
parent33bd53758ef69de22eb8d7282461da6ba3e35083 (diff)
parent84362da3c531ea8bbdebff8bf82df5bfee77e6dd (diff)
downloadpyramid-0bdaa91fb2407f98e490aa16b52f4a825e9914d1.tar.gz
pyramid-0bdaa91fb2407f98e490aa16b52f4a825e9914d1.tar.bz2
pyramid-0bdaa91fb2407f98e490aa16b52f4a825e9914d1.zip
Merge pull request #661 from k-j-kleist/master
add optparse option "--stop-daemon" only if appropriate
-rw-r--r--pyramid/scripts/pserve.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index ea2a4ae09..151aa34b6 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -136,12 +136,13 @@ class PServeCommand(object):
metavar="GROUP",
help="Set the group (usually only possible when run as root)")
- parser.add_option(
- '--stop-daemon',
- dest='stop_daemon',
- action='store_true',
- help=('Stop a daemonized server (given a PID file, or default '
- 'pyramid.pid file)'))
+ if hasattr(os, 'fork'):
+ parser.add_option(
+ '--stop-daemon',
+ dest='stop_daemon',
+ action='store_true',
+ help=('Stop a daemonized server (given a PID file, or default '
+ 'pyramid.pid file)'))
_scheme_re = re.compile(r'^[a-z][a-z]+:', re.I)