From af2c85b5a98ba062a9a58c6c92279f3371d59bb4 Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@rimspace.net>
Date: Tue, 1 Mar 2011 20:33:56 -0800
Subject: (#6551) remove deprecated 'env' parameter to the 'exec' type

We deprecated this back in 0.24, so we can eliminate it in the next release.
We ran through our deprecation period full of constant complaints to the
users.  Now we just fail.
---
 lib/puppet/type/exec.rb |  9 ---------
 test/ral/type/exec.rb   | 43 -------------------------------------------
 2 files changed, 52 deletions(-)

diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index daa49e223..033183ae7 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -211,15 +211,6 @@ module Puppet
       end
     end
 
-    newparam(:env) do
-      desc "This parameter is deprecated. Use 'environment' instead."
-
-      munge do |value|
-        warning "'env' is deprecated on exec; use 'environment' instead."
-        resource[:environment] = value
-      end
-    end
-
     newparam(:environment) do
       desc "Any additional environment variables you want to set for a
         command.  Note that if you use this to set PATH, it will override
diff --git a/test/ral/type/exec.rb b/test/ral/type/exec.rb
index 933994b88..829b1a068 100755
--- a/test/ral/type/exec.rb
+++ b/test/ral/type/exec.rb
@@ -609,49 +609,6 @@ class TestExec < Test::Unit::TestCase
     }
   end
 
-  def test_envparam
-
-    exec = Puppet::Type.newexec(
-
-      :command => "echo $envtest",
-      :path => ENV["PATH"],
-
-      :env => "envtest=yayness"
-    )
-
-    assert(exec, "Could not make exec")
-
-    output = status = nil
-    assert_nothing_raised {
-      output, status = exec.run("echo $envtest")
-    }
-
-    assert_equal("yayness\n", output)
-
-    # Now check whether we can do multiline settings
-    assert_nothing_raised do
-      exec[:env] = "envtest=a list of things
-and stuff"
-  end
-
-  output = status = nil
-  assert_nothing_raised {
-    output, status = exec.run('echo "$envtest"')
-    }
-    assert_equal("a list of things\nand stuff\n", output)
-
-    # Now test arrays
-    assert_nothing_raised do
-      exec[:env] = ["funtest=A", "yaytest=B"]
-    end
-
-    output = status = nil
-    assert_nothing_raised {
-      output, status = exec.run('echo "$funtest" "$yaytest"')
-    }
-    assert_equal("A B\n", output)
-  end
-
   def test_environmentparam
 
     exec = Puppet::Type.newexec(
-- 
cgit