X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2Fcommon.bash;h=b64d414c6b4f84799942fb64127861439a01a94a;hb=647da28e;hp=c660905f7748321184b252621985c5d8da643ed4;hpb=cef91eed52efd44af9f14b522a5f75978d1eec6c;p=dbsrgits%2FDBIx-Class.git diff --git a/maint/travis-ci_scripts/common.bash b/maint/travis-ci_scripts/common.bash index c660905..b64d414 100755 --- a/maint/travis-ci_scripts/common.bash +++ b/maint/travis-ci_scripts/common.bash @@ -167,11 +167,15 @@ _dep_inst_with_test() { for m in "$@"; do if ! perl -e ' -eval ( q{require } . ( +my $mod = ( $ARGV[0] =~ m{ \/ .*? ([^\/]+) $ }x ? do { my @p = split (/\-/, $1); pop @p; join "::", @p } : $ARGV[0] -) ) or ( print $@ and exit 1) +); + +$mod = q{List::Util} if $mod eq q{Scalar::List::Utils}; + +eval qq{require($mod)} or ( print $@ and exit 1) ' "$m" 2> /dev/null ; then echo -e "$m installation seems to have failed"