diff options
author | Justin Davis <jrcd83@gmail.com> | 2011-09-09 23:50:09 +0200 |
---|---|---|
committer | Justin Davis <jrcd83@gmail.com> | 2011-09-09 23:50:09 +0200 |
commit | 8b9e98f62c624e0f329709ce7f52f3909e8ca1d1 (patch) | |
tree | 2d0eb9b3f77bb35023958d45e593214409d98092 | |
parent | 96eb738d719c2ab517cb0feeed5dfbade430346a (diff) | |
download | genpkg-8b9e98f62c624e0f329709ce7f52f3909e8ca1d1.tar.gz genpkg-8b9e98f62c624e0f329709ce7f52f3909e8ca1d1.tar.xz |
Fix bug in perl-dist where test modules weren't moved the checkdepends.
-rwxr-xr-x | bin/macros/perl-dist | 13 | ||||
-rw-r--r-- | pbj/perlbrew.pbj | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/bin/macros/perl-dist b/bin/macros/perl-dist index c942048..c2a5b9a 100755 --- a/bin/macros/perl-dist +++ b/bin/macros/perl-dist @@ -142,15 +142,10 @@ sub _yankcheckers my ($deps_ref) = @_; my %checkdeps; - for my $testdep (grep { /perl-test-/ } keys %$deps_ref) { + for my $testdep (grep { /^perl-pod-coverage$|perl-test-/ } + keys %$deps_ref) { my $val = delete $deps_ref->{$testdep}; - $checkdeps{$testdep} = $val if $val; - } - - # Also extract Pod::Coverage module into checkdepends - for my $dep ( qw/ perl-pod-coverage / ) { - my $val = delete $deps_ref->{$dep}; - $checkdeps{$dep} = $val if $val; + $checkdeps{$testdep} = $val if defined $val; } return \%checkdeps; @@ -256,7 +251,7 @@ sub prereqs # need for checking (aka "testing"). Older perl METAs do not # have this separated. Force any test modules to be checkdepends. if (! $pkgdeps{'checkdepends'} && $pkgname !~ /\Aperl-test-/) { - my $checkdeps; + my $checkdeps = {}; my $makedeps = $pkgdeps{'makedepends'}; _merge($checkdeps, _yankcheckers($makedeps)); $pkgdeps{'checkdepends'} = $checkdeps; diff --git a/pbj/perlbrew.pbj b/pbj/perlbrew.pbj new file mode 100644 index 0000000..9448d45 --- /dev/null +++ b/pbj/perlbrew.pbj @@ -0,0 +1,6 @@ +! perl-cpan App-perlbrew ++ provides perl-app-perlbrew=${pkgver} +< makedepends perl-io-all +> checkdepends +< makedepends perl-path-class +> checkdepends |