From 140786570176f5fcd8774f83fbf0bf4087a2cc32 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Sun, 1 Feb 2009 11:05:48 +1100
Subject: Revert "Fixed #1916 - Added environment option to puppetd"

This reverts commit 8d0086b3cb877765857b7ff0dee454b14417430a.
---
 CHANGELOG   |  2 --
 bin/puppetd | 16 +++-------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a5ff124c3..cd206a81f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,4 @@
 0.25.0
-    Fixed #1916 - Added environment option to puppetd
-
     Fixed #1910 - Updated logcheck regex
 
     Fixed #1879 - Added to tidy documentation
diff --git a/bin/puppetd b/bin/puppetd
index 29b0e7249..ecea2d894 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -9,10 +9,9 @@
 # = Usage
 #
 #   puppetd  [-D|--daemonize|--no-daemonize] [-d|--debug] [--disable] [--enable]
-#            [-e|--environment=<environment>] [-h|--help] [--fqdn <host name>] 
-#            [-l|--logdest syslog|<file>|console] [-o|--onetime] 
-#            [--serve <handler>] [-t|--test] [--noop] [-V|--version] 
-#            [-v|--verbose] [-w|--waitforcert <seconds>]
+#       [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console]
+#       [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
+#       [-V|--version] [-v|--verbose] [-w|--waitforcert <seconds>]
 #
 # = Description
 #
@@ -91,14 +90,6 @@
 #
 #   +puppetd+ exits after executing this.
 #
-# environment:: 
-#   Specify an environment to run. This enables you to run a different
-#   set of manifests, modules, templates etc. for a different
-#   environment than is default. For example, the default environment
-#   is set to 'production', and so using this option you could test
-#   your new development module by specifying that the 'development'
-#   environment should be run, like so: puppetd --test --environment=development
-#
 # fqdn::
 #   Set the fully-qualified domain name of the client.  This is only used for
 #   certificate purposes, but can be used to override the discovered hostname.
@@ -179,7 +170,6 @@ options = [
 	[ "--disable",	    			GetoptLong::NO_ARGUMENT ],
 	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
 	[ "--enable",	    			GetoptLong::NO_ARGUMENT ],
-	[ "--environment=<environment>",        GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--fqdn",     "-f",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
-- 
cgit