summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-04 12:53:09 -0500
committerLuke Kanies <luke@madstop.com>2007-10-04 12:53:09 -0500
commit9236179fadf5d0ee68abab395ba1102cd04f3471 (patch)
treec7c0e2b33fdaa438a003a359989321cc3a55005b /lib/puppet
parente5c623e6d49704e313bc1a77b6a02ac6c92c7a2b (diff)
downloadpuppet-9236179fadf5d0ee68abab395ba1102cd04f3471.tar.gz
puppet-9236179fadf5d0ee68abab395ba1102cd04f3471.tar.xz
puppet-9236179fadf5d0ee68abab395ba1102cd04f3471.zip
Attempting to reproduce and fix #829 by applying patch by Paul. I could not
get a test to show the exception, nor could I figure out how the coding bug could have actually had an impact, but it's an innocent-enough fix, so I'm fine applying it.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/type/pfile.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 1507c1725..2b3df1ae7 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -891,8 +891,8 @@ module Puppet
# For directories, keep all of the sources, so that
# sourceselect still works as planned.
if type == "directory"
- newsource = @parameters[:source].should.collect do |source|
- source + file
+ newsource = @parameters[:source].should.collect do |tmpsource|
+ tmpsource + file
end
else
newsource = source + file