Merge pull request Pylons#661 from k-j-kleist/master

add optparse option "--stop-daemon" only if appropriate
seacoastboy · Aug 19, 2012 · 0bdaa91 · 0bdaa91
2 parents 33bd537 + 84362da
commit 0bdaa91
Showing 1 changed file with 7 additions and 6 deletions.
diff --git 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)