diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-08 13:44:33 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-08 13:44:33 -0800 |
| commit | 4bd45db0215e70129bf5b2a8ee4424e4e8699549 (patch) | |
| tree | 16c4c7a5bf26e35927e52796e951f33d60d0670e | |
| parent | 2092e61264899c742924a30148ebe1e079b60d38 (diff) | |
| parent | 455a89129a6860215d8e79972f720eaa7564e625 (diff) | |
| download | puppet-4bd45db0215e70129bf5b2a8ee4424e4e8699549.tar.gz puppet-4bd45db0215e70129bf5b2a8ee4424e4e8699549.tar.xz puppet-4bd45db0215e70129bf5b2a8ee4424e4e8699549.zip | |
Merge branch 'tickets/2.6.next/5794-create-report-parentdir' of git://github.com/vvitayaudom/puppet into 2.6.next
* 'tickets/2.6.next/5794-create-report-parentdir' of git://github.com/vvitayaudom/puppet:
(#5794) create reports directory when creating host specific directory
| -rw-r--r-- | lib/puppet/reports/store.rb | 5 | ||||
| -rw-r--r-- | spec/unit/reports/store_spec.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb index 99a9fc177..625a263b3 100644 --- a/lib/puppet/reports/store.rb +++ b/lib/puppet/reports/store.rb @@ -15,7 +15,10 @@ Puppet::Reports.register_report(:store) do dir = File.join(Puppet[:reportdir], client) - Dir.mkdir(dir, 0750) unless FileTest.exists?(dir) + if ! FileTest.exists?(dir) + FileUtils.mkdir_p(dir) + FileUtils.chmod_R(0750, dir) + end # Now store the report. now = Time.now.gmtime diff --git a/spec/unit/reports/store_spec.rb b/spec/unit/reports/store_spec.rb index 1acb5badd..9d9042386 100644 --- a/spec/unit/reports/store_spec.rb +++ b/spec/unit/reports/store_spec.rb @@ -11,7 +11,7 @@ describe processor do describe "#process" do include PuppetSpec::Files before :each do - Puppet[:reportdir] = tmpdir('reports') + Puppet[:reportdir] = tmpdir('reports') << '/reports' @report = YAML.load_file(File.join(PuppetSpec::FIXTURE_DIR, 'yaml/report2.6.x.yaml')).extend processor end |