diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-11 20:07:31 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-11 20:07:31 +0000 |
| commit | 1ec1b9905d0b2f0ba0a0cb3b7dc293ee204cdbc5 (patch) | |
| tree | cc5238164ffb31324c804895b33ae89477c2ad07 /lib | |
| parent | 8f28c6f110dc4f8ecf230f26e150974dcb9918d7 (diff) | |
| download | puppet-1ec1b9905d0b2f0ba0a0cb3b7dc293ee204cdbc5.tar.gz puppet-1ec1b9905d0b2f0ba0a0cb3b7dc293ee204cdbc5.tar.xz puppet-1ec1b9905d0b2f0ba0a0cb3b7dc293ee204cdbc5.zip | |
Fixing weird case involving interpolating config params in a URL
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1388 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/config.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/config.rb b/lib/puppet/config.rb index c41c6318c..e4dfe9086 100644 --- a/lib/puppet/config.rb +++ b/lib/puppet/config.rb @@ -640,7 +640,8 @@ Generated on #{Time.now}. parent = $1 if pval = @parent[parent] newval = value.to_s.sub(/\$#{parent.to_s}/, pval.to_s) - return File.join(newval.split("/")) + #return File.join(newval.split("/")) + return newval else raise Puppet::DevError, "Could not find value for %s" % parent end |