[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.457,1.458

[Randy W. S. <si...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12735/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Don't allow undefined distribution version.

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -d -r1.457 -r1.458
--- Base.pm	8 Jul 2005 01:39:46 -0000	1.457
+++ Base.pm	9 Jul 2005 12:18:08 -0000	1.458
@@ -680,21 +680,24 @@
 sub dist_version {
   my ($self) = @_;
   my $p = $self->{properties};
-  
+
   return $p->{dist_version} if defined $p->{dist_version};
-  
+
   if ($self->module_name) {
     $p->{dist_version_from} ||= join( '/', 'lib', split '::', $self->module_name ) . '.pm';
   }
-  
+
+  if ( $p->{dist_version_from} ) {
+    my $version_from = File::Spec->catfile( split( qr{/}, $p->{dist_version_from} ) );
+    my $pm_info = Module::Build::ModuleInfo->new_from_file( $version_from );
+    $p->{dist_version} = $pm_info->version();
+  }
+
   die ("Can't determine distribution version, must supply either 'dist_version',\n".
        "'dist_version_from', or 'module_name' parameter")
-    unless $p->{dist_version_from};
-  
-  my $version_from = File::Spec->catfile( split '/', $p->{dist_version_from} );
-  
-  my $pm_info = Module::Build::ModuleInfo->new_from_file( $version_from );
-  return $p->{dist_version} = $pm_info->version();
+    unless $p->{dist_version};
+
+  return $p->{dist_version};
 }
 
 sub dist_author   { shift->_pod_parse('author')   }