summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-08-27 21:53:00 -0700
committerLuke Kanies <luke@madstop.com>2008-08-27 21:53:00 -0700
commit7c68fdb46802dbd3a57f5f7be3333ed6feacad45 (patch)
tree6e385b1a0fee71b86957e57f049a788ba8ee9b6a /lib/puppet
parentac419872e273dc31635f042bb1a23c7785dc227a (diff)
downloadpuppet-7c68fdb46802dbd3a57f5f7be3333ed6feacad45.tar.gz
puppet-7c68fdb46802dbd3a57f5f7be3333ed6feacad45.tar.xz
puppet-7c68fdb46802dbd3a57f5f7be3333ed6feacad45.zip
Fixing FileServing::Base so that it can recurse on a single file.
It was throwing exceptions if you tried to use it on a file instead of a directory. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/file_serving/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/file_serving/base.rb b/lib/puppet/file_serving/base.rb
index 9a50833de..c59a54786 100644
--- a/lib/puppet/file_serving/base.rb
+++ b/lib/puppet/file_serving/base.rb
@@ -23,7 +23,7 @@ class Puppet::FileServing::Base
# Return the full path to our file. Fails if there's no path set.
def full_path
- if relative_path.nil? or relative_path == ""
+ if relative_path.nil? or relative_path == "" or relative_path == "."
path
else
File.join(path, relative_path)