From 7b06185df2bca91213e4e7f8a0de88a6a5d5877d Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Wed, 18 May 2011 20:12:06 +0100 Subject: [PATCH] Updated Compress-Raw-Bzip2 to CPAN version 2.035 [DELTA] 2.035 6 May 2011 * No Changes --- Porting/Maintainers.pl | 2 +- cpan/Compress-Raw-Bzip2/Changes | 4 ++ cpan/Compress-Raw-Bzip2/README | 6 +-- cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm | 2 +- cpan/Compress-Raw-Bzip2/t/000prereq.t | 2 +- .../Compress-Raw-Bzip2/t/compress/CompTestUtils.pm | 60 +++++++++++++++++++--- 6 files changed, 64 insertions(+), 12 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 3039731..fb530ca 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -369,7 +369,7 @@ use File::Glob qw(:case); 'Compress::Raw::Bzip2' => { 'MAINTAINER' => 'pmqs', - 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.033.tar.gz', + 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.035.tar.gz', 'FILES' => q[cpan/Compress-Raw-Bzip2], 'EXCLUDED' => [ qr{^t/Test/}, qw( bzip2-src/bzip2-cpp.patch diff --git a/cpan/Compress-Raw-Bzip2/Changes b/cpan/Compress-Raw-Bzip2/Changes index 441f4f0..a20f44c 100644 --- a/cpan/Compress-Raw-Bzip2/Changes +++ b/cpan/Compress-Raw-Bzip2/Changes @@ -1,6 +1,10 @@ CHANGES ------- + 2.035 6 May 2011 + + * No Changes + 2.033 11 Jan 2011 * Fixed typos & spelling errors. [perl# 81782] diff --git a/cpan/Compress-Raw-Bzip2/README b/cpan/Compress-Raw-Bzip2/README index 75e1147..edf465b 100644 --- a/cpan/Compress-Raw-Bzip2/README +++ b/cpan/Compress-Raw-Bzip2/README @@ -1,9 +1,9 @@ Compress-Raw-Bzip2 - Version 2.033 + Version 2.035 - 11th January 2011 + 6th May 2011 Copyright (c) 2005-2011 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -164,7 +164,7 @@ To help me help you, I need all of the following information: If you haven't installed Compress-Raw-Bzip2 then search Compress::Raw::Bzip2.pm for a line like this: - $VERSION = "2.033" ; + $VERSION = "2.035" ; c. The version of bzip2 you have used. If you have successfully installed Compress-Raw-Bzip2, this one-liner diff --git a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm index 9aadba3..0fdd790 100644 --- a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm +++ b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm @@ -12,7 +12,7 @@ use Carp ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.033'; +$VERSION = '2.035'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/cpan/Compress-Raw-Bzip2/t/000prereq.t b/cpan/Compress-Raw-Bzip2/t/000prereq.t index 83a77fd..af6db00 100644 --- a/cpan/Compress-Raw-Bzip2/t/000prereq.t +++ b/cpan/Compress-Raw-Bzip2/t/000prereq.t @@ -19,7 +19,7 @@ BEGIN if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - my $VERSION = '2.033'; + my $VERSION = '2.035'; my @NAMES = qw( ); diff --git a/cpan/Compress-Raw-Bzip2/t/compress/CompTestUtils.pm b/cpan/Compress-Raw-Bzip2/t/compress/CompTestUtils.pm index f21045d..644a618 100644 --- a/cpan/Compress-Raw-Bzip2/t/compress/CompTestUtils.pm +++ b/cpan/Compress-Raw-Bzip2/t/compress/CompTestUtils.pm @@ -25,6 +25,14 @@ sub like_eval like $@, @_ ; } +BEGIN { + eval { + require File::Temp; + } ; + +} + + { package LexFile ; @@ -36,8 +44,9 @@ sub like_eval my $self = shift ; foreach (@_) { - # autogenerate the name unless if none supplied - $_ = "tst" . $index ++ . ".tmp" + Carp::croak "NO!!!!" if defined $_; + # autogenerate the name if none supplied + $_ = "tst" . $$ . "X" . $index ++ . ".tmp" unless defined $_; } chmod 0777, @_; @@ -58,19 +67,58 @@ sub like_eval package LexDir ; use File::Path; + + our ($index); + $index = '00000'; + our ($useTempFile) = defined &File::Temp::tempdir; + our ($useTempDir) = defined &File::Temp::newdir; + sub new { my $self = shift ; - foreach (@_) { rmtree $_ } - bless [ @_ ], $self ; + + if ( $useTempDir) + { + foreach (@_) + { + Carp::croak "NO!!!!" if defined $_; + $_ = File::Temp->newdir(DIR => '.'); + } + bless [ @_ ], $self ; + } + elsif ( $useTempFile) + { + foreach (@_) + { + Carp::croak "NO!!!!" if defined $_; + $_ = File::Temp::tempdir(DIR => '.', CLEANUP => 1); + } + bless [ @_ ], $self ; + } + else + { + foreach (@_) + { + Carp::croak "NO!!!!" if defined $_; + # autogenerate the name if none supplied + $_ = "tmpdir" . $$ . "X" . $index ++ . ".tmp" ; + } + foreach (@_) { rmtree $_; mkdir $_, 0777 } + bless [ @_ ], $self ; + } + } sub DESTROY { - my $self = shift ; - foreach (@$self) { rmtree $_ } + if (! $useTempFile) + { + my $self = shift ; + foreach (@$self) { rmtree $_ } + } } } + sub readFile { my $f = shift ; -- 2.7.4