adding --noop to puppet executable, and removing some extraneous comments

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@688 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 4 insertions, 1 deletions

diff --git a/bin/puppet b/bin/puppet
index a6bf90c61..d3eead009 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -65,12 +65,14 @@ result = GetoptLong.new(
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
     [ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
     [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
+    [ "--noop",     "-n",			GetoptLong::NO_ARGUMENT ],
     [ "--parse-only",  "-p",		GetoptLong::NO_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
 )
 
 debug = false
 verbose = false
+noop = false
 logfile = false
 parseonly = false
 
@@ -87,6 +89,8 @@ begin
                     puts "No help available unless you have RDoc::usage installed"
                     exit
                 end
+            when "--noop"
+                noop = true
             when "--verbose"
                 verbose = true
             when "--parse-only"
diff --git a/lib/puppet/type/component.rb b/lib/puppet/type/component.rb
index 26b9a89d1..22b5490b8 100644
--- a/lib/puppet/type/component.rb
+++ b/lib/puppet/type/component.rb
@@ -82,7 +82,6 @@ module Puppet
                 args[:type] = "component"
             end
             super(args)
-            Puppet.warning "Name is %s" % self.name
             #Puppet.debug "Made component with name %s and type %s" %
             #    [self.name, self[:type]]
         end