In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/9d911456e3a576e9feb61c1f017cb0a5777de685?hp=f04d27738ee6adaecc621ab34af012bf3eeefd8c>
- Log ----------------------------------------------------------------- commit 9d911456e3a576e9feb61c1f017cb0a5777de685 Author: Chris 'BinGOs' Williams <[email protected]> Date: Thu Oct 20 13:39:53 2016 +0100 Update Archive-Tar to CPAN version 2.14 [DELTA] 2.14 20/10/2016 - Fix roundtrip test when tar executable is absent ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/Archive-Tar/lib/Archive/Tar.pm | 2 +- cpan/Archive-Tar/lib/Archive/Tar/Constant.pm | 2 +- cpan/Archive-Tar/lib/Archive/Tar/File.pm | 2 +- cpan/Archive-Tar/t/09_roundtrip.t | 31 +++++++++++++++++++++++++++- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index e92fab2..322e6d4 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -120,7 +120,7 @@ use File::Glob qw(:case); %Modules = ( 'Archive::Tar' => { - 'DISTRIBUTION' => 'BINGOS/Archive-Tar-2.12.tar.gz', + 'DISTRIBUTION' => 'BINGOS/Archive-Tar-2.14.tar.gz', 'FILES' => q[cpan/Archive-Tar], 'BUGS' => '[email protected]', 'EXCLUDED' => [ diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm index 1731cb2..858696f 100644 --- a/cpan/Archive-Tar/lib/Archive/Tar.pm +++ b/cpan/Archive-Tar/lib/Archive/Tar.pm @@ -31,7 +31,7 @@ use vars qw[$DEBUG $error $VERSION $WARN $FOLLOW_SYMLINK $CHOWN $CHMOD $DEBUG = 0; $WARN = 1; $FOLLOW_SYMLINK = 0; -$VERSION = "2.12"; +$VERSION = "2.14"; $CHOWN = 1; $CHMOD = 1; $SAME_PERMISSIONS = $> == 0 ? 1 : 0; diff --git a/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm b/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm index bd62e02..b7d19d9 100644 --- a/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm +++ b/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm @@ -3,7 +3,7 @@ package Archive::Tar::Constant; BEGIN { require Exporter; - $VERSION = '2.12'; + $VERSION = '2.14'; @ISA = qw[Exporter]; require Time::Local if $^O eq "MacOS"; diff --git a/cpan/Archive-Tar/lib/Archive/Tar/File.pm b/cpan/Archive-Tar/lib/Archive/Tar/File.pm index ef9eb06..22aadc1 100644 --- a/cpan/Archive-Tar/lib/Archive/Tar/File.pm +++ b/cpan/Archive-Tar/lib/Archive/Tar/File.pm @@ -13,7 +13,7 @@ use Archive::Tar::Constant; use vars qw[@ISA $VERSION]; #@ISA = qw[Archive::Tar]; -$VERSION = '2.12'; +$VERSION = '2.14'; ### set value to 1 to oct() it during the unpack ### diff --git a/cpan/Archive-Tar/t/09_roundtrip.t b/cpan/Archive-Tar/t/09_roundtrip.t index fd5eed4..7e0120c 100644 --- a/cpan/Archive-Tar/t/09_roundtrip.t +++ b/cpan/Archive-Tar/t/09_roundtrip.t @@ -9,6 +9,31 @@ use File::Temp qw( tempfile ); use Archive::Tar; +BEGIN { + eval { require IPC::Cmd; }; + unless ( $@ ) { + diag('Using IPC::Cmd'); + *can_run = \&IPC::Cmd::can_run; + } + else { + diag('Using fallback'); + *can_run = sub { + require ExtUtils::MakeMaker; + my $cmd = shift; + my $_cmd = $cmd; + return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); + require Config; + for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + next if $dir eq ''; + require File::Spec; + my $abs = File::Spec->catfile($dir, $cmd); + return $abs if (-x $abs or $abs = MM->maybe_command($abs)); + } + return; + }; + } +} + # Identify tarballs available for testing # Some contain only files # Others contain both files and directories @@ -81,7 +106,10 @@ for my $archive_name (@file_only_archives) { # what we'll get when round-tripping on an archive which contains one or more # entries for directories. -for my $archive_name (@file_and_directory_archives) { +SKIP: { + skip 'No tar command found', scalar @file_and_directory_archives unless can_run('tar'); + + for my $archive_name (@file_and_directory_archives) { my @contents; if ($archive_name =~ m/\.tar$/) { @contents = qx{tar tvf $archive_name}; @@ -131,4 +159,5 @@ for my $archive_name (@file_and_directory_archives) { [ @oldfiles ], "$archive_name roundtrip on file names" ); + } } -- Perl5 Master Repository
