diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-07-12 16:17:43 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-07-12 16:17:43 -0700 |
| commit | 8730b290c4f45f3f76d57d2648bfb642528d0762 (patch) | |
| tree | d082e9654a46f77e820fb17723a60ce252e201c2 /lib | |
| parent | 1feccc3f2db29d112308a55032e7f93ca44b45aa (diff) | |
| parent | 45b3908e03734388b6c699ffbc4223f43b44a1d5 (diff) | |
| download | puppet-8730b290c4f45f3f76d57d2648bfb642528d0762.tar.gz puppet-8730b290c4f45f3f76d57d2648bfb642528d0762.tar.xz puppet-8730b290c4f45f3f76d57d2648bfb642528d0762.zip | |
Merge branch 'ticket/2.7.x/4142-metadata_json' into 2.7.x
* ticket/2.7.x/4142-metadata_json:
(#4142) Fix module check not to fail when empty metadata.json
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/module.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb index 059591ed8..00468df96 100644 --- a/lib/puppet/module.rb +++ b/lib/puppet/module.rb @@ -42,7 +42,10 @@ class Puppet::Module def has_metadata? return false unless metadata_file - FileTest.exist?(metadata_file) + return false unless FileTest.exist?(metadata_file) + + metadata = PSON.parse File.read(metadata_file) + return metadata.is_a?(Hash) && !metadata.keys.empty? end def initialize(name, environment = nil) |