diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-05 22:27:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-05 22:27:26 +0000 |
commit | b56b320b5e2515160073fa1b469514002688fe11 (patch) | |
tree | 965a7100c5e45fca8ec803d22b8b6ce14fca4633 /Master/tlpkg/tlperl/lib/Archive | |
parent | d26c206452d2e285c3bbf949f34011e4a55fd8f9 (diff) |
tlperl 5.22.1 from siep
git-svn-id: svn://tug.org/texlive/trunk@40252 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/Archive')
-rw-r--r-- | Master/tlpkg/tlperl/lib/Archive/Tar.pm | 12 | ||||
-rw-r--r-- | Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlperl/lib/Archive/Tar/File.pm | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Master/tlpkg/tlperl/lib/Archive/Tar.pm b/Master/tlpkg/tlperl/lib/Archive/Tar.pm index 50afbb334b9..1b792df8024 100644 --- a/Master/tlpkg/tlperl/lib/Archive/Tar.pm +++ b/Master/tlpkg/tlperl/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 = "1.96"; +$VERSION = "2.04"; $CHOWN = 1; $CHMOD = 1; $SAME_PERMISSIONS = $> == 0 ? 1 : 0; @@ -429,12 +429,13 @@ sub _read_tar { } elsif ($filter && $entry->name !~ $filter) { $skip = 1; + } elsif ($filter_cb && ! $filter_cb->($entry)) { + $skip = 2; + ### skip this entry if it's a pax header. This is a special file added ### by, among others, git-generated tarballs. It holds comments and is ### not meant for extracting. See #38932: pax_global_header extracted } elsif ( $entry->name eq PAX_HEADER or $entry->type =~ /^(x|g)$/ ) { - $skip = 2; - } elsif ($filter_cb && ! $filter_cb->($entry)) { $skip = 3; } @@ -519,13 +520,14 @@ sub _read_tar { if ($filter && $entry->name !~ $filter) { next LOOP; + } elsif ($filter_cb && ! $filter_cb->($entry)) { + next LOOP; + ### skip this entry if it's a pax header. This is a special file added ### by, among others, git-generated tarballs. It holds comments and is ### not meant for extracting. See #38932: pax_global_header extracted } elsif ( $entry->name eq PAX_HEADER or $entry->type =~ /^(x|g)$/ ) { next LOOP; - } elsif ($filter_cb && ! $filter_cb->($entry)) { - next LOOP; } if ( $extract && !$entry->is_longlink diff --git a/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm b/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm index 957ac278adc..399aaf69707 100644 --- a/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm +++ b/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm @@ -3,7 +3,7 @@ package Archive::Tar::Constant; BEGIN { require Exporter; - $VERSION = '1.96'; + $VERSION = '2.04'; @ISA = qw[Exporter]; require Time::Local if $^O eq "MacOS"; diff --git a/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm b/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm index 39fca623fab..3aa1b3cd9ae 100644 --- a/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm +++ b/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm @@ -13,7 +13,7 @@ use Archive::Tar::Constant; use vars qw[@ISA $VERSION]; #@ISA = qw[Archive::Tar]; -$VERSION = '1.96'; +$VERSION = '2.04'; ### set value to 1 to oct() it during the unpack ### |