summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-07-11 19:42:00 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-07-11 19:42:00 +0000
commit8f28c6f110dc4f8ecf230f26e150974dcb9918d7 (patch)
tree6f27c7ff7d4f94d46277e9aec1b7250852d9c87d /lib
parentb116ac7acb63db61f29883ca4936052e546d9104 (diff)
downloadpuppet-8f28c6f110dc4f8ecf230f26e150974dcb9918d7.tar.gz
puppet-8f28c6f110dc4f8ecf230f26e150974dcb9918d7.tar.xz
puppet-8f28c6f110dc4f8ecf230f26e150974dcb9918d7.zip
Fixing weird cases where configs might think non-files could be files
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1387 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/config.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/config.rb b/lib/puppet/config.rb
index 3c76a623f..c41c6318c 100644
--- a/lib/puppet/config.rb
+++ b/lib/puppet/config.rb
@@ -299,7 +299,7 @@ class Config
case value
when true, false, "true", "false":
klass = CBoolean
- when /^\$/, /^\//:
+ when /^\$\w+\//, /^\//:
klass = CFile
when String, Integer, Float: # nothing
klass = CElement
@@ -823,7 +823,7 @@ Generated on #{Time.now}.
obj[:loglevel] = "debug"
if self.section
- obj.tags = ["puppet", "configuration", self.section]
+ obj.tags += ["puppet", "configuration", self.section, self.name]
end
objects << obj
objects