tokuhirom (owner)

Revisions

gist: 225125 Download_button fork
public
Public Clone URL: git://gist.github.com/225125.git
Embed All Files: show embed
zshzIp8zJ #
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
Index: lib/Module/Install/Admin/ScanDeps.pm
===================================================================
--- lib/Module/Install/Admin/ScanDeps.pm (revision 9930)
+++ lib/Module/Install/Admin/ScanDeps.pm (working copy)
@@ -9,7 +9,7 @@
 }
 
 sub scan_dependencies {
- my ($self, $pkg, $perl_version) = @_;
+ my ($self, $pkg, $perl_version, $pkg_version) = @_;
 
     return if $pkg eq 'perl';
 
@@ -25,7 +25,7 @@
     die "Module::CoreList has no information on perl $perl_version"
         unless exists $Module::CoreList::version{$perl_version};
 
- if (my $min_version = Module::CoreList->first_release($pkg)) {
+ if (my $min_version = Module::CoreList->first_release($pkg, $pkg_version)) {
         return if $min_version <= $perl_version;
     }
 
Index: lib/Module/Install/Admin/Include.pm
===================================================================
--- lib/Module/Install/Admin/Include.pm (revision 9930)
+++ lib/Module/Install/Admin/Include.pm (working copy)
@@ -17,8 +17,8 @@
 }
 
 sub include_deps {
- my $self = shift;
- my $deps = $self->admin->scan_dependencies($_[0]) or return;
+ my ($self, $module, $version) = @_;
+ my $deps = $self->admin->scan_dependencies($module, $self->perl_version, $version) or return;
  foreach my $key ( sort keys %$deps ) {
  $self->include($key);
  }
@@ -39,12 +39,13 @@
 sub auto_include_deps {
  my $self = shift;
  foreach my $module (
- map { $_->[0] }
+ map { $_ }
  map { @$_ }
  grep { $_ }
  $self->build_requires
  ) {
- $self->include_deps($module);
+ my ($name, $version) = @{$module};
+ $self->include_deps($name, $version);
  }
 }