summaryrefslogtreecommitdiffstats
path: root/lib/puppet/module.rb
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-07-20 16:35:46 -0700
committerNick Lewis <nick@puppetlabs.com>2011-07-20 16:35:46 -0700
commitba6230b6039d62b0713c9d5e3ff61a68f70ef723 (patch)
tree41523b6f3a3e5fbc83f33784de408f1d5dd71825 /lib/puppet/module.rb
parente8a2287cdac5dbf086b60af65e301f3e2360ee2b (diff)
parent8820a78b5793ba6266b3974ac90a9405d73b8343 (diff)
downloadpuppet-ba6230b6039d62b0713c9d5e3ff61a68f70ef723.tar.gz
puppet-ba6230b6039d62b0713c9d5e3ff61a68f70ef723.tar.xz
puppet-ba6230b6039d62b0713c9d5e3ff61a68f70ef723.zip
Merge branch '2.7.x'
Diffstat (limited to 'lib/puppet/module.rb')
-rw-r--r--lib/puppet/module.rb5
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)