diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-07-14 15:27:54 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-07-14 15:27:54 -0700 |
| commit | afc3616dc31f4a432410be4081a657726a257986 (patch) | |
| tree | 72587e4fbe49bceff756e9fdb3e718612e4b2a93 /lib | |
| parent | acf5d3ae8c45099534d0b4d43276c1ae3d586c8a (diff) | |
| parent | 790e947e5581fc51e7002c81c3848fb7048bb6ac (diff) | |
| download | puppet-afc3616dc31f4a432410be4081a657726a257986.tar.gz puppet-afc3616dc31f4a432410be4081a657726a257986.tar.xz puppet-afc3616dc31f4a432410be4081a657726a257986.zip | |
Merge branch '2.6.x' into 2.7.x
* 2.6.x:
(maint) Cleanup and strengthen acceptance tests
(#7144) Update Settings#writesub to convert mode to Fixnum
(maint) Fix platform dection for RHEL
Manually Resolved Conflicts:
acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb
spec/unit/util/settings_spec.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/util.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/util/settings.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index ce9d4642b..ff09221a2 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -30,7 +30,6 @@ module Util end end - def self.synchronize_on(x,type) sync_object,users = 0,1 begin diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index f243b8691..4559e9af3 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -721,7 +721,7 @@ if @config.include?(:run_mode) end Puppet::Util::SUIDManager.asuser(*chown) do - mode = obj.mode || 0640 + mode = obj.mode ? obj.mode.to_i : 0640 args << "w" if args.empty? args << mode |