diff options
author | Ian Taylor <ian@lorf.org> | 2009-06-05 12:39:04 -0400 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-06-06 09:12:00 +1000 |
commit | 4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch) | |
tree | 126540beec3c65448e01e1b48d27275ec4ee6ea4 /lib/puppet/file_serving | |
parent | 97e6975d69f239e24993315a25a3117b1daa48c3 (diff) | |
download | puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip |
Removed extra whitespace from end of lines
Diffstat (limited to 'lib/puppet/file_serving')
-rw-r--r-- | lib/puppet/file_serving/base.rb | 2 | ||||
-rw-r--r-- | lib/puppet/file_serving/configuration/parser.rb | 4 | ||||
-rw-r--r-- | lib/puppet/file_serving/content.rb | 2 | ||||
-rw-r--r-- | lib/puppet/file_serving/fileset.rb | 4 | ||||
-rw-r--r-- | lib/puppet/file_serving/mount.rb | 2 | ||||
-rw-r--r-- | lib/puppet/file_serving/mount/file.rb | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/lib/puppet/file_serving/base.rb b/lib/puppet/file_serving/base.rb index d1fa9dfd2..c82bb1992 100644 --- a/lib/puppet/file_serving/base.rb +++ b/lib/puppet/file_serving/base.rb @@ -48,7 +48,7 @@ class Puppet::FileServing::Base def links=(value) value = value.to_sym value = :manage if value == :ignore - raise(ArgumentError, ":links can only be set to :manage or :follow") unless [:manage, :follow].include?(value) + raise(ArgumentError, ":links can only be set to :manage or :follow") unless [:manage, :follow].include?(value) @links = value end diff --git a/lib/puppet/file_serving/configuration/parser.rb b/lib/puppet/file_serving/configuration/parser.rb index 50368fdaf..eef2d7852 100644 --- a/lib/puppet/file_serving/configuration/parser.rb +++ b/lib/puppet/file_serving/configuration/parser.rb @@ -55,7 +55,7 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile # Allow a given pattern access to a mount. def allow(mount, value) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = value.split(/\s*,\s*/).each { |val| begin mount.info "allowing %s access" % val @@ -69,7 +69,7 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile # Deny a given pattern access to a mount. def deny(mount, value) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = value.split(/\s*,\s*/).each { |val| begin mount.info "denying %s access" % val diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb index c1ecff749..9fc1d08b3 100644 --- a/lib/puppet/file_serving/content.rb +++ b/lib/puppet/file_serving/content.rb @@ -36,7 +36,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base def content unless defined?(@content) and @content # This stat can raise an exception, too. - raise(ArgumentError, "Cannot read the contents of links unless following links") if stat().ftype == "symlink" + raise(ArgumentError, "Cannot read the contents of links unless following links") if stat().ftype == "symlink" @content = ::File.read(full_path()) end diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb index a6a4b62a1..50e4e1e80 100644 --- a/lib/puppet/file_serving/fileset.rb +++ b/lib/puppet/file_serving/fileset.rb @@ -111,14 +111,14 @@ class Puppet::FileServing::Fileset elsif request.options.include?(param.to_s) value = request.options[param.to_s] end - next if value.nil? + next if value.nil? value = true if value == "true" value = false if value == "false" value = Integer(value) if value.is_a?(String) and value =~ /^\d+$/ send(param.to_s + "=", value) end end - + private # Pull the recursion logic into one place. It's moderately hairy, and this diff --git a/lib/puppet/file_serving/mount.rb b/lib/puppet/file_serving/mount.rb index 5b74ad218..5ab6d8688 100644 --- a/lib/puppet/file_serving/mount.rb +++ b/lib/puppet/file_serving/mount.rb @@ -15,7 +15,7 @@ class Puppet::FileServing::Mount < Puppet::Network::AuthStore include Puppet::Util::Logging attr_reader :name - + # Determine the environment to use, if any. def environment(node_name) if node_name and node = Puppet::Node.find(node_name) diff --git a/lib/puppet/file_serving/mount/file.rb b/lib/puppet/file_serving/mount/file.rb index 15e343c57..9053ee18c 100644 --- a/lib/puppet/file_serving/mount/file.rb +++ b/lib/puppet/file_serving/mount/file.rb @@ -79,7 +79,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount # Create a map for a specific node. def clientmap(node) { - "h" => node.sub(/\..*$/, ""), + "h" => node.sub(/\..*$/, ""), "H" => node, "d" => node.sub(/[^.]+\./, "") # domain name } @@ -101,7 +101,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount path.gsub(/%(.)/) do |v| key = $1 - if key == "%" + if key == "%" "%" else map[key] || v |