diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-04 12:52:47 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-04 12:52:47 -0500 |
| commit | a073639bac47c6b1f5638bb0e7a131ae75dff128 (patch) | |
| tree | eb368124e8045cb4b2a38b2a06ccb36cd428246e /lib | |
| parent | 1ea34a227ad75df853045f579e80cb455ca3dd5c (diff) | |
| parent | 9236179fadf5d0ee68abab395ba1102cd04f3471 (diff) | |
| download | puppet-a073639bac47c6b1f5638bb0e7a131ae75dff128.tar.gz puppet-a073639bac47c6b1f5638bb0e7a131ae75dff128.tar.xz puppet-a073639bac47c6b1f5638bb0e7a131ae75dff128.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet into routing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/type/pfile.rb | 4 |
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 |