From b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 19 Aug 2012 12:15:27 -0400 Subject: - Undo effects of merging pull #661 because tests wont pass on windows https://github.com/Pylons/pyramid/pull/661 --- CHANGES.txt | 3 --- pyramid/scripts/pserve.py | 13 ++++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index abd30c950..0291d924a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -23,9 +23,6 @@ Bug Fixes https://github.com/Pylons/pyramid/issues/606 https://github.com/Pylons/pyramid/issues/607 -- ``pserve``: don't show --stop-daemon option on Windows. - https://github.com/Pylons/pyramid/pull/661 - Features -------- diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index 151aa34b6..ea2a4ae09 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -136,13 +136,12 @@ class PServeCommand(object): metavar="GROUP", help="Set the group (usually only possible when run as root)") - 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)')) + 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) -- cgit v1.2.3