From: David Golden <dagolden@cpan.org>
Date: Wed, 3 Aug 2011 00:34:54 +0000 (-0400)
Subject: Fix references to ModuleInfo [RT #66133]
X-Git-Tag: release_1.0.5~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d846be69c4b623809a79ca4b23c46a21ca69d9b3;p=p5sagit%2FModule-Metadata.git

Fix references to ModuleInfo [RT #66133]
---

diff --git a/Changes b/Changes
index a652436..d588619 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 1.0.5 2011-08-01 08:24:00
   - Localize $package::VERSION during version discovery (MIYAGAWA)
+  - Fix references to Module::Build::ModuleInfo [RT #66133] (DAGOLDEN)
 
 1.0.4 2011-02-03 07:55:00
   - Fix broken metadata.t when @INC has relative paths (JJORE)
diff --git a/lib/Module/Metadata.pm b/lib/Module/Metadata.pm
index 6b535b2..bbbee35 100644
--- a/lib/Module/Metadata.pm
+++ b/lib/Module/Metadata.pm
@@ -183,7 +183,6 @@ sub new_from_module {
   
         if ( $package eq $prime_package ) {
           if ( exists( $prime{$package} ) ) {
-            # M::B::ModuleInfo will handle this conflict
             die "Unexpected conflict in '$package'; multiple versions found.\n";
           } else {
             $prime{$package}{file} = $mapped_filename;
@@ -654,14 +653,14 @@ Module::Metadata - Gather package and POD information from perl module files
 
 =item new_from_file($filename, collect_pod => 1)
 
-Construct a C<ModuleInfo> object given the path to a file. Takes an optional
+Construct a C<Module::Metadata> object given the path to a file. Takes an optional
 argument C<collect_pod> which is a boolean that determines whether
 POD data is collected and stored for reference. POD data is not
 collected by default. POD headings are always collected.
 
 =item new_from_module($module, collect_pod => 1, inc => \@dirs)
 
-Construct a C<ModuleInfo> object given a module or package name. In addition
+Construct a C<Module::Metadata> object given a module or package name. In addition
 to accepting the C<collect_pod> argument as described above, this
 method accepts a C<inc> argument which is a reference to an array of
 of directories to search for the module. If none are given, the