diff options
| author |   Kent Fredric <kentfredric@gmail.com> | 2013-12-23 07:07:13 +1300 |
|---|---|---|
| committer | Kent Fredric <kentfredric@gmail.com> | 2013-12-23 07:07:13 +1300 |
| commit | 7db9a9530caaaeee843174560d6907548d0f0879 (patch) | |
| tree | 3abf9b3bde1e70f1ae30f756fbd19455f59b633b /scripts | |
| parent | Version Bump (diff) | |
| download | perl-overlay-7db9a9530caaaeee843174560d6907548d0f0879.tar.gz perl-overlay-7db9a9530caaaeee843174560d6907548d0f0879.tar.bz2 perl-overlay-7db9a9530caaaeee843174560d6907548d0f0879.zip | |
scripts: Temporarily avoid problems with range operators by simply ignoring their presence and letting manual intervention hopefully help
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/deptools.pm | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/scripts/lib/deptools.pm b/scripts/lib/deptools.pm index 31f8f96ab..29f29976e 100644 --- a/scripts/lib/deptools.pm +++ b/scripts/lib/deptools.pm @@ -151,8 +151,10 @@ sub provider_map { $specialvs->set_newest_mod( $provider->distribution, $mod ); $specialvs->set_oldest_mod( $provider->distribution, $mod ); - if ( $wanted->no_version_dep or $mod->version >= $wanted->version ) { - $specialvs->set_closest_mod( $provider->distribution, $mod ); + if ( $wanted->version_string !~ /[<=>!]/ ) { + if ( $wanted->no_version_dep or $mod->version >= $wanted->version ) { + $specialvs->set_closest_mod( $provider->distribution, $mod ); + } } push @provided_matching_mods, $mod->debug_string @@ -191,11 +193,19 @@ sub get_dep_phases { $phases{$phase} //= []; $modules{$module} //= []; - require Gentoo::PerlMod::Version; - my $v = Gentoo::PerlMod::Version::gentooize_version( $dep->{version}, { lax => 1 } ); + if ( $dep->{version} !~ /[<=>!]/ ) { + require Gentoo::PerlMod::Version; + my $v = Gentoo::PerlMod::Version::gentooize_version( $dep->{version}, { lax => 1 } ); + + push @{ $phases{$phase} }, [ $dep->{module}, $dep->{version}, $v, $dep->{relationship} ]; + push @{ $modules{$module} }, [ $dep->{version}, $v, $dep->{phase}, $dep->{relationship} ]; + } + else { + push @{ $phases{$phase} }, [ $dep->{module}, $dep->{version}, "??? " . $dep->{version}, $dep->{relationship} ]; + push @{ $modules{$module} }, [ $dep->{version}, "??? " . $dep->{version}, $dep->{phase}, $dep->{relationship} ]; + + } - push @{ $phases{$phase} }, [ $dep->{module}, $dep->{version}, $v, $dep->{relationship} ]; - push @{ $modules{$module} }, [ $dep->{version}, $v, $dep->{phase}, $dep->{relationship} ]; } return { phases => \%phases, modules => \%modules }; } |