Fix prereq to META conversion for perl 5.10 with Module::Build 0.34 (…

…which doesn't emit MYMETA)
aputs · Jun 18, 2013 · cc9456f · cc9456f
1 parent 404dd7e
commit cc9456f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/App/cpanminus/script.pm b/lib/App/cpanminus/script.pm
@@ -2435,8 +2435,8 @@ sub extract_meta_prereqs {
 
     if (-e '_build/prereqs') {
         $self->chat("Checking dependencies from _build/prereqs ...\n");
-        my $mymeta = do { open my $in, "_build/prereqs"; $self->safe_eval(join "", <$in>) };
-        @deps = $self->extract_prereqs($mymeta, $dist);
+        my $prereqs = do { open my $in, "_build/prereqs"; $self->safe_eval(join "", <$in>) };
+        @deps = $self->extract_prereqs({ name => $meta->{name}, version => $meta->{version}, %$prereqs }, $dist);
     } elsif (-e 'Makefile') {
         $self->chat("Finding PREREQ from Makefile ...\n");
         open my $mf, "Makefile";

diff --git a/xt/build_no_mymeta.t b/xt/build_no_mymeta.t
@@ -0,0 +1,16 @@
+use strict;
+use xt::Run;
+use Test::More;
+
+plan skip_all => "only on 5.10.1" if $] != 5.010001;
+
+run '-n', 'Module::[email protected]';
+like last_build_log, qr/installed Module-Build/;
+
+run 'Hook::LexWrap';
+unlike last_build_log, qr/Failed to upconvert metadata/;
+
+done_testing;
+
+
+