summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-03-05 18:55:32 -0700
committerLuke Kanies <luke@madstop.com>2008-03-05 18:55:32 -0700
commitee8fac6f24a35edf9234e49fb7aae71e625917f4 (patch)
tree59aa34544e6c4a91d1de43bfaa928eb0761ebbcc /lib
parent8192475a041d933b4fdf9e82142b09c9633952f4 (diff)
downloadpuppet-ee8fac6f24a35edf9234e49fb7aae71e625917f4.tar.gz
puppet-ee8fac6f24a35edf9234e49fb7aae71e625917f4.tar.xz
puppet-ee8fac6f24a35edf9234e49fb7aae71e625917f4.zip
Changed name of method for clarity per code review
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/util/settings.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 259e2045b..6e0b4b66d 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -243,7 +243,7 @@ class Puppet::Util::Settings
# Make a directory with the appropriate user, group, and mode
def mkdir(default)
- obj = get_config_default(default)
+ obj = get_config_file_default(default)
Puppet::Util::SUIDManager.asuser(obj.owner, obj.group) do
mode = obj.mode || 0750
@@ -731,14 +731,14 @@ Generated on #{Time.now}.
# Open a file with the appropriate user, group, and mode
def write(default, *args, &bloc)
- obj = get_config_default(default)
+ obj = get_config_file_default(default)
writesub(default, value(obj.name), *args, &bloc)
end
# Open a non-default file under a default dir with the appropriate user,
# group, and mode
def writesub(default, file, *args, &bloc)
- obj = get_config_default(default)
+ obj = get_config_file_default(default)
chown = nil
if Puppet::Util::SUIDManager.uid == 0
chown = [obj.owner, obj.group]
@@ -764,7 +764,7 @@ Generated on #{Time.now}.
end
def readwritelock(default, *args, &bloc)
- file = value(get_config_default(default).name)
+ file = value(get_config_file_default(default).name)
tmpfile = file + ".tmp"
sync = Sync.new
unless FileTest.directory?(File.dirname(tmpfile))
@@ -795,7 +795,7 @@ Generated on #{Time.now}.
private
- def get_config_default(default)
+ def get_config_file_default(default)
obj = nil
unless obj = @config[default]
raise ArgumentError, "Unknown default %s" % default