r20018 - in /branches/upstream/libpar-perl/current: ./ inc/Module/ inc/Module/Install/ inc/Test/ inc/Test/Builder/ lib/ lib/PAR/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri May 16 14:22:32 UTC 2008
Author: gregoa
Date: Fri May 16 14:22:32 2008
New Revision: 20018
URL: http://svn.debian.org/wsvn/?sc=1&rev=20018
Log:
Load PAR-0.977/ into branches/upstream/libpar-perl/current.
Added:
branches/upstream/libpar-perl/current/MANIFEST.SKIP
Removed:
branches/upstream/libpar-perl/current/SIGNATURE
Modified:
branches/upstream/libpar-perl/current/AUTHORS
branches/upstream/libpar-perl/current/ChangeLog
branches/upstream/libpar-perl/current/MANIFEST
branches/upstream/libpar-perl/current/META.yml
branches/upstream/libpar-perl/current/Makefile.PL
branches/upstream/libpar-perl/current/inc/Module/Install.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libpar-perl/current/inc/Test/Builder.pm
branches/upstream/libpar-perl/current/inc/Test/Builder/Module.pm
branches/upstream/libpar-perl/current/inc/Test/More.pm
branches/upstream/libpar-perl/current/lib/PAR.pm
branches/upstream/libpar-perl/current/lib/PAR/Heavy.pm
Modified: branches/upstream/libpar-perl/current/AUTHORS
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/AUTHORS?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/AUTHORS (original)
+++ branches/upstream/libpar-perl/current/AUTHORS Fri May 16 14:22:32 2008
@@ -121,6 +121,7 @@
Rong-En Fan
Ryan Briones
Sascha Wuestemann
+Scott Stanton
Sim Lim Hai
Simon Andrews
Simon Cozens (SIMON)
Modified: branches/upstream/libpar-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/ChangeLog?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/ChangeLog (original)
+++ branches/upstream/libpar-perl/current/ChangeLog Fri May 16 14:22:32 2008
@@ -1,3 +1,10 @@
+[Changes for 0.977 - Oct 19, 2007]
+* Bug fixes, etc.
+ - HPUX doesn't like shared libraries being unlinked while in use. So don't
+ try to do this even in clean mode. (Workaround will be in par.pl)
+ (Scott Stanton)
+ - Fix DLL extraction file name matching in PAR::Heavy.
+ - Save two system calls per DLL during DLL extraction in PAR::Heavy.
[Changes for 0.976 - Jul 29, 2007]
* New features
Modified: branches/upstream/libpar-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/MANIFEST?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/MANIFEST (original)
+++ branches/upstream/libpar-perl/current/MANIFEST Fri May 16 14:22:32 2008
@@ -19,9 +19,9 @@
lib/PAR/Tutorial.pod
Makefile.PL
MANIFEST This list of files
+MANIFEST.SKIP
META.yml
README
-SIGNATURE
t/00-pod.t
t/01-basic.t
t/40-par-hashref.t
Added: branches/upstream/libpar-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/MANIFEST.SKIP?rev=20018&op=file
==============================================================================
--- branches/upstream/libpar-perl/current/MANIFEST.SKIP (added)
+++ branches/upstream/libpar-perl/current/MANIFEST.SKIP Fri May 16 14:22:32 2008
@@ -1,0 +1,23 @@
+#defaults
+^\..*\.sw.$
+^myldr/Makefile$
+^myldr/Makefile\.old$
+^myldr/main.[^c].*$
+^myldr/x?static(?:.[^c].*)?$
+^myldr/my_.*$
+^myldr/perlxsi.c$
+^myldr/par(?:\.\w+)?$
+^myldr/sha1.[co]$
+^myldr/.*\.pdb$
+^myldr/usernamefrompwuid\.h$
+^package/parl-.*$
+^script/parl(?:\.(?!pod).+)?$
+^script/parldyn(?:\.(?!pod).+)?$
+^MANIFEST.bak$
+^Makefile$
+^Makefile.old$
+^blib/
+^pm_to_blib
+^blibdirs
+\B\.svn\b
+^debian/
Modified: branches/upstream/libpar-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/META.yml?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/META.yml (original)
+++ branches/upstream/libpar-perl/current/META.yml Fri May 16 14:22:32 2008
@@ -1,8 +1,9 @@
---
abstract: Perl Archive Tookit
-author: Audrey Tang <cpan at audreyt.org>
+author:
+ - Audrey Tang <cpan at audreyt.org>
distribution_type: module
-generated_by: Module::Install version 0.67
+generated_by: Module::Install version 0.68
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.3.html
@@ -16,10 +17,10 @@
provides:
PAR:
file: lib/PAR.pm
- version: 0.976
+ version: 0.977
PAR::Heavy:
file: lib/PAR/Heavy.pm
- version: 0.09
+ version: 0.11
recommends:
Digest: Module::Signature
requires:
@@ -29,4 +30,4 @@
File::Temp: 0.05
PAR::Dist: 0.22
perl: 5.6.0
-version: 0.976
+version: 0.977
Modified: branches/upstream/libpar-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/Makefile.PL?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/Makefile.PL (original)
+++ branches/upstream/libpar-perl/current/Makefile.PL Fri May 16 14:22:32 2008
@@ -31,4 +31,5 @@
no_index directory => 'contrib';
auto_provides;
-WriteAll sign => 1;
+#WriteAll sign => 1;
+WriteAll;
Modified: branches/upstream/libpar-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install.pm Fri May 16 14:22:32 2008
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.67';
+ $VERSION = '0.68';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm Fri May 16 14:22:32 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.67';
+$VERSION = '0.68';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm Fri May 16 14:22:32 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm Fri May 16 14:22:32 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm Fri May 16 14:22:32 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm Fri May 16 14:22:32 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm Fri May 16 14:22:32 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm Fri May 16 14:22:32 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm Fri May 16 14:22:32 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Test/Builder.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Test/Builder.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Test/Builder.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Test/Builder.pm Fri May 16 14:22:32 2008
@@ -9,7 +9,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.70';
+$VERSION = '0.74';
$VERSION = eval $VERSION; # make the alpha version come out as a number
# Make Test::Builder thread-safe for ithreads.
@@ -690,7 +690,8 @@
# I'm not ready to publish this. It doesn't deal with array return
# values from the code or context.
-#line 999
+
+#line 1000
sub _try {
my($self, $code) = @_;
@@ -703,15 +704,15 @@
return wantarray ? ($return, $@) : $return;
}
-#line 1021
+#line 1022
sub is_fh {
my $self = shift;
my $maybe_fh = shift;
return 0 unless defined $maybe_fh;
- return 1 if ref $maybe_fh eq 'GLOB'; # its a glob
- return 1 if ref \$maybe_fh eq 'GLOB'; # its a glob ref
+ return 1 if ref $maybe_fh eq 'GLOB'; # its a glob ref
+ return 1 if ref \$maybe_fh eq 'GLOB'; # its a glob
return eval { $maybe_fh->isa("IO::Handle") } ||
# 5.5.4's tied() and can() doesn't like getting undef
@@ -719,7 +720,7 @@
}
-#line 1066
+#line 1067
sub level {
my($self, $level) = @_;
@@ -731,7 +732,7 @@
}
-#line 1099
+#line 1100
sub use_numbers {
my($self, $use_nums) = @_;
@@ -743,7 +744,7 @@
}
-#line 1133
+#line 1134
foreach my $attribute (qw(No_Header No_Ending No_Diag)) {
my $method = lc $attribute;
@@ -762,7 +763,7 @@
}
-#line 1187
+#line 1188
sub diag {
my($self, @msgs) = @_;
@@ -789,7 +790,7 @@
return 0;
}
-#line 1224
+#line 1225
sub _print {
my($self, @msgs) = @_;
@@ -813,7 +814,7 @@
print $fh $msg;
}
-#line 1258
+#line 1259
sub _print_diag {
my $self = shift;
@@ -823,7 +824,7 @@
print $fh @_;
}
-#line 1295
+#line 1296
sub output {
my($self, $fh) = @_;
@@ -909,7 +910,7 @@
}
-#line 1395
+#line 1396
sub _message_at_caller {
my $self = shift;
@@ -938,7 +939,7 @@
}
}
-#line 1443
+#line 1444
sub current_test {
my($self, $num) = @_;
@@ -974,7 +975,7 @@
}
-#line 1488
+#line 1489
sub summary {
my($self) = shift;
@@ -982,14 +983,14 @@
return map { $_->{'ok'} } @{ $self->{Test_Results} };
}
-#line 1543
+#line 1544
sub details {
my $self = shift;
return @{ $self->{Test_Results} };
}
-#line 1568
+#line 1569
sub todo {
my($self, $pack) = @_;
@@ -1002,7 +1003,7 @@
: 0;
}
-#line 1589
+#line 1590
sub caller {
my($self, $height) = @_;
@@ -1012,9 +1013,9 @@
return wantarray ? @caller : $caller[0];
}
-#line 1601
-
-#line 1615
+#line 1602
+
+#line 1616
#'#
sub _sanity_check {
@@ -1027,7 +1028,7 @@
'Somehow you got a different number of results than tests ran!');
}
-#line 1636
+#line 1637
sub _whoa {
my($self, $check, $desc) = @_;
@@ -1040,7 +1041,7 @@
}
}
-#line 1658
+#line 1659
sub _my_exit {
$? = $_[0];
@@ -1049,7 +1050,7 @@
}
-#line 1671
+#line 1672
$SIG{__DIE__} = sub {
# We don't want to muck with death in an eval, but $^S isn't
@@ -1169,6 +1170,6 @@
$Test->_ending if defined $Test and !$Test->no_ending;
}
-#line 1846
+#line 1847
1;
Modified: branches/upstream/libpar-perl/current/inc/Test/Builder/Module.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Test/Builder/Module.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Test/Builder/Module.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Test/Builder/Module.pm Fri May 16 14:22:32 2008
@@ -6,7 +6,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = '0.68';
+$VERSION = '0.74';
use strict;
Modified: branches/upstream/libpar-perl/current/inc/Test/More.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/inc/Test/More.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Test/More.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Test/More.pm Fri May 16 14:22:32 2008
@@ -17,7 +17,7 @@
use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
-$VERSION = '0.70';
+$VERSION = '0.74';
$VERSION = eval $VERSION; # make the alpha version come out as a number
use Test::Builder::Module;
@@ -233,32 +233,37 @@
my($pack,$filename,$line) = caller;
- local($@,$!,$SIG{__DIE__}); # isolate eval
-
- if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
- # probably a version check. Perl needs to see the bare number
- # for it to work with non-Exporter based modules.
- eval <<USE;
+ # Work around a glitch in $@ and eval
+ my $eval_error;
+ {
+ local($@,$!,$SIG{__DIE__}); # isolate eval
+
+ if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
+ # probably a version check. Perl needs to see the bare number
+ # for it to work with non-Exporter based modules.
+ eval <<USE;
package $pack;
use $module $imports[0];
USE
- }
- else {
- eval <<USE;
+ }
+ else {
+ eval <<USE;
package $pack;
use $module \@imports;
USE
- }
-
- my $ok = $tb->ok( !$@, "use $module;" );
+ }
+ $eval_error = $@;
+ }
+
+ my $ok = $tb->ok( !$eval_error, "use $module;" );
unless( $ok ) {
- chomp $@;
+ chomp $eval_error;
$@ =~ s{^BEGIN failed--compilation aborted at .*$}
{BEGIN failed--compilation aborted at $filename line $line.}m;
$tb->diag(<<DIAGNOSTIC);
Tried to use '$module'.
- Error: $@
+ Error: $eval_error
DIAGNOSTIC
}
@@ -266,7 +271,7 @@
return $ok;
}
-#line 702
+#line 707
sub require_ok ($) {
my($module) = shift;
@@ -310,10 +315,16 @@
$module =~ /^[a-zA-Z]\w*$/;
}
-#line 779
+#line 784
use vars qw(@Data_Stack %Refs_Seen);
my $DNE = bless [], 'Does::Not::Exist';
+
+sub _dne {
+ ref $_[0] eq ref $DNE;
+}
+
+
sub is_deeply {
my $tb = Test::More->builder;
@@ -386,8 +397,8 @@
foreach my $idx (0..$#vals) {
my $val = $vals[$idx];
$vals[$idx] = !defined $val ? 'undef' :
- $val eq $DNE ? "Does not exist" :
- ref $val ? "$val" :
+ _dne($val) ? "Does not exist" :
+ ref $val ? "$val" :
"'$val'";
}
@@ -411,7 +422,7 @@
return '';
}
-#line 919
+#line 930
sub diag {
my $tb = Test::More->builder;
@@ -420,7 +431,7 @@
}
-#line 988
+#line 999
#'#
sub skip {
@@ -448,7 +459,7 @@
}
-#line 1075
+#line 1086
sub todo_skip {
my($why, $how_many) = @_;
@@ -469,7 +480,7 @@
last TODO;
}
-#line 1128
+#line 1139
sub BAIL_OUT {
my $reason = shift;
@@ -478,7 +489,7 @@
$tb->BAIL_OUT($reason);
}
-#line 1167
+#line 1178
#'#
sub eq_array {
@@ -536,7 +547,7 @@
if( defined $e1 xor defined $e2 ) {
$ok = 0;
}
- elsif ( $e1 == $DNE xor $e2 == $DNE ) {
+ elsif ( _dne($e1) xor _dne($e2) ) {
$ok = 0;
}
elsif ( $same_ref and ($e1 eq $e2) ) {
@@ -602,7 +613,7 @@
}
-#line 1298
+#line 1309
sub eq_hash {
local @Data_Stack;
@@ -635,7 +646,7 @@
return $ok;
}
-#line 1355
+#line 1366
sub eq_set {
my($a1, $a2) = @_;
@@ -661,6 +672,6 @@
);
}
-#line 1545
+#line 1556
1;
Modified: branches/upstream/libpar-perl/current/lib/PAR.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/lib/PAR.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/lib/PAR.pm (original)
+++ branches/upstream/libpar-perl/current/lib/PAR.pm Fri May 16 14:22:32 2008
@@ -1,5 +1,5 @@
package PAR;
-$PAR::VERSION = '0.976';
+$PAR::VERSION = '0.977';
use 5.006;
use strict;
@@ -32,7 +32,7 @@
=head1 VERSION
-This document describes version 0.976 of PAR, released July 29, 2007.
+This document describes version 0.977 of PAR, released October 19, 2007.
=head1 SYNOPSIS
@@ -957,7 +957,7 @@
# delete it has the only effect of giving ugly warnings
($fh, $filename) = File::Temp::tempfile(
DIR => $par_temp,
- UNLINK => ($^O ne 'MSWin32'),
+ UNLINK => ($^O ne 'MSWin32' and $^O !~ /hpux/),
) or die "Cannot create temporary file: $!";
binmode($fh);
return ($fh, 1, $filename);
Modified: branches/upstream/libpar-perl/current/lib/PAR/Heavy.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libpar-perl/current/lib/PAR/Heavy.pm?rev=20018&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/lib/PAR/Heavy.pm (original)
+++ branches/upstream/libpar-perl/current/lib/PAR/Heavy.pm Fri May 16 14:22:32 2008
@@ -1,5 +1,5 @@
package PAR::Heavy;
-$PAR::Heavy::VERSION = '0.09';
+$PAR::Heavy::VERSION = '0.11';
=head1 NAME
@@ -84,21 +84,22 @@
my $member;
$member = PAR::_find_par_any(undef, $file, 1) if defined &PAR::_find_par_any;
- return $bootstrap->(@args) unless $member;
+ return $bootstrap->(@args) unless $member; # we failed to find the dll, let DynaLoader (try or) throw an error
$FullCache{$file} = _dl_extract($member, $file);
# Now extract all associated shared objs in the same auto/ dir
+ # XXX: shouldn't this also set $FullCache{...} for those files?
my $first = $member->fileName;
- my $pat = $first;
- $pat =~ s{[^/]*$}{};
+ my $path_pattern = $first;
+ $path_pattern =~ s{[^/]*$}{};
if ($PAR::LastAccessedPAR) {
foreach my $member ( $PAR::LastAccessedPAR->members ) {
next if $member->isDirectory;
my $name = $member->fileName;
next if $name eq $first;
- next unless $name =~ m{^/?\Q$pat\E\/[^/]?\.\Q$dlext\E[^/]*$};
+ next unless $name =~ m{^/?\Q$path_pattern\E\/[^/]*\.\Q$dlext\E[^/]*$};
$name =~ s{.*/}{};
_dl_extract($member, $file, $name);
}
@@ -126,20 +127,20 @@
($fh, $filename) = File::Temp::tempfile(
DIR => ($ENV{PAR_TEMP} || File::Spec->tmpdir),
SUFFIX => ".$dlext",
- UNLINK => ($^O ne 'MSWin32'),
+ UNLINK => ($^O ne 'MSWin32' and $^O !~ /hpux/),
);
- ($filename) = $filename =~ /^([\x20-\xff]+)$/;
+ ($filename) = $filename =~ /^([\x20-\xff]+)$/;
}
else {
$filename = File::Spec->catfile(
($ENV{PAR_TEMP} || File::Spec->tmpdir),
($name || ($member->crc32String . ".$dlext"))
);
- ($filename) = $filename =~ /^([\x20-\xff]+)$/;
+ ($filename) = $filename =~ /^([\x20-\xff]+)$/;
open $fh, '>', $filename or die $!
- unless -r $filename and -e $filename
- and -s $filename == $member->uncompressedSize;
+ unless -r $filename and -e _
+ and -s _ == $member->uncompressedSize;
}
if ($fh) {
@@ -170,7 +171,7 @@
=head1 COPYRIGHT
-Copyright 2002, 2003, 2004, 2005, 2006 by Audrey Tang
+Copyright 2002-2007 by Audrey Tang
E<lt>cpan at audreyt.orgE<gt>.
This program is free software; you can redistribute it and/or modify it
More information about the Pkg-perl-cvs-commits
mailing list