diff options
author | mh <mh@immerda.ch> | 2012-06-08 12:26:43 -0300 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-06-08 12:26:43 -0300 |
commit | 50a1943175bd203116d100eb5cf4f01f2fc6ded1 (patch) | |
tree | 6234a35ed8679be909c120ec7f3a402bad2febd7 | |
parent | e90839b24871f9cfd2166a116e45de5f27fe9e50 (diff) | |
download | puppet-common-50a1943175bd203116d100eb5cf4f01f2fc6ded1.tar.gz puppet-common-50a1943175bd203116d100eb5cf4f01f2fc6ded1.tar.bz2 |
in 2.7 recmkdir is gone
-rw-r--r-- | lib/puppet/parser/functions/tfile.rb | 3 | ||||
-rw-r--r-- | spec/unit/parser/functions/tfile.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/tfile.rb b/lib/puppet/parser/functions/tfile.rb index a984892..acb6609 100644 --- a/lib/puppet/parser/functions/tfile.rb +++ b/lib/puppet/parser/functions/tfile.rb @@ -9,7 +9,8 @@ Puppet::Parser::Functions::newfunction( unless File.exists?(path) dir = File.dirname(path) unless File.directory?(dir) - Puppet::Util.recmkdir(dir,0700) + require 'fileutils' + FileUtils.mkdir_p(dir, :mode => 0700) end require 'fileutils' FileUtils.touch(path) diff --git a/spec/unit/parser/functions/tfile.rb b/spec/unit/parser/functions/tfile.rb index 1cc37d4..5c8f636 100644 --- a/spec/unit/parser/functions/tfile.rb +++ b/spec/unit/parser/functions/tfile.rb @@ -44,7 +44,7 @@ describe "the tfile function" do it "should create the path if it does not exist" do File.stubs(:exists?).with('/some_path/aa').returns(false) File.stubs(:directory?).with('/some_path').returns(false) - Puppet::Util.expects(:recmkdir).with("/some_path",0700) + FileUtils.expects(:mkdir_p).with("/some_path",:mode => 0700) FileUtils.expects(:touch).with('/some_path/aa') result = @scope.function_tfile(['/some_path/aa']) result.should == "foo1\nfoo2\n" |