[svn:Module-Build] r8112 - Module-Build/trunk/lib/Module/Build

[kwilliams]

Author: kwilliams
Date: Mon Nov 27 19:19:17 2006
New Revision: 8112

Modified:
   Module-Build/trunk/lib/Module/Build/ModuleInfo.pm

Log:
Refactor to make a _parse_fh() method.  Also, don't parse a second
version line if we're not going to use it anyway.


Modified: Module-Build/trunk/lib/Module/Build/ModuleInfo.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/ModuleInfo.pm   (original)
+++ Module-Build/trunk/lib/Module/Build/ModuleInfo.pm   Mon Nov 27 19:19:17 2006
@@ -163,6 +163,12 @@
   my $fh = IO::File->new( $filename )
     or die( "Can't open '$filename': $!" );
 
+  $self->_parse_fh($fh);
+}
+
+sub _parse_fh {
+  my ($self, $fh) = @_;
+
   my( $in_pod, $seen_end, $need_vers ) = ( 0, 0, 0 );
   my( @pkgs, %vers, %pod, @pod );
   my $pkg = 'main';
@@ -215,14 +221,13 @@
        push( @pkgs, $vers_pkg ) unless grep( $vers_pkg eq $_, @pkgs );
        $need_vers = 0 if $vers_pkg eq $pkg;
 
-       my $v =
-         $self->_evaluate_version_line( $vers_sig, $vers_fullname, $line );
        unless ( defined $vers{$vers_pkg} && length $vers{$vers_pkg} ) {
-         $vers{$vers_pkg} = $v;
+         $vers{$vers_pkg} = 
+           $self->_evaluate_version_line( $vers_sig, $vers_fullname, $line );
        } else {
          warn <<"EOM";
-Package '$vers_pkg' already declared with version '$vers{$vers_pkg}'
-ignoring new version '$v'.
+Package '$vers_pkg' already declared with version '$vers{$vers_pkg}',
+ignoring subsequent declaration.
 EOM
        }