diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-19 11:25:47 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-19 11:25:47 -0400 |
| commit | ae18bc240966608097e25cb08614ead1667d7af8 (patch) | |
| tree | 41e8220fb97544f7feaecbd4c76e787fde069644 | |
| parent | ed2eab3d823003d0c5f1c3d92bf256b80497e1f1 (diff) | |
| parent | 0bdaa91fb2407f98e490aa16b52f4a825e9914d1 (diff) | |
| download | pyramid-ae18bc240966608097e25cb08614ead1667d7af8.tar.gz pyramid-ae18bc240966608097e25cb08614ead1667d7af8.tar.bz2 pyramid-ae18bc240966608097e25cb08614ead1667d7af8.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | pyramid/scripts/pserve.py | 13 |
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) |