Perl-Dist-WiX

changeset 1059:cb8dc2759add

Forgot to move where $module_id was set in the last change.
author Curtis Jewell <perl@curtisjewell.name>
date Wed Jun 15 03:46:37 2011 -0600 (2011-06-15)
parents 77193cede00c
children a1d077cb6961
files lib/Perl/Dist/WiX/Mixin/BuildPerl.pm
line diff
     1.1 --- a/lib/Perl/Dist/WiX/Mixin/BuildPerl.pm	Tue Jun 14 06:44:16 2011 -0600
     1.2 +++ b/lib/Perl/Dist/WiX/Mixin/BuildPerl.pm	Wed Jun 15 03:46:37 2011 -0600
     1.3 @@ -595,7 +595,6 @@
     1.4  	}
     1.5  
     1.6  	# Install the toolchain dists
     1.7 -	my ( $core, $module_id );
     1.8  	my $perl_version  = $self->perl_version_literal();
     1.9  	my $default_force = $self->force();
    1.10  	foreach my $dist ( @toolchain ) {
    1.11 @@ -603,6 +602,9 @@
    1.12  		my $release_testing   = 0;
    1.13  		my $overwritable      = 0;
    1.14  		my $force             = $default_force;
    1.15 +		# Actually DO the installation, now
    1.16 +		# that we've got the information we need.
    1.17 +		my $module_id = $self->_module_fix( $self->_name_to_module($dist) );
    1.18  		my $core =
    1.19  		  exists $Module::CoreList::version{$perl_version}{$module_id}
    1.20  		  ? 1
    1.21 @@ -690,11 +692,14 @@
    1.22  				$core = 1;
    1.23  
    1.24  			}
    1.25 +			when (/Version-Requirements-/msx) {
    1.26 +
    1.27 +				# Must be in core to overwrite EU::MM's version.
    1.28 +				$core = 1;
    1.29 +
    1.30 +			}
    1.31  		} ## end given
    1.32  
    1.33 -		# Actually DO the installation, now
    1.34 -		# that we've got the information we need.
    1.35 -		$module_id = $self->_module_fix( $self->_name_to_module($dist) );
    1.36  #<<<
    1.37  		$self->install_distribution(
    1.38  			name              => $dist,