r23295 - in /branches/upstream/libio-compress-base-perl/current: ./ lib/IO/Compress/ lib/IO/Compress/Base/ lib/IO/Uncompress/ private/ t/compress/
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Wed Jul 16 17:10:25 UTC 2008
Author: dmn
Date: Wed Jul 16 17:10:23 2008
New Revision: 23295
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23295
Log:
[svn-upgrade] Integrating new upstream version, libio-compress-base-perl (2.012)
Modified:
branches/upstream/libio-compress-base-perl/current/Changes
branches/upstream/libio-compress-base-perl/current/META.yml
branches/upstream/libio-compress-base-perl/current/README
branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base.pm
branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base/Common.pm
branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/AnyUncompress.pm
branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/Base.pm
branches/upstream/libio-compress-base-perl/current/private/MakeUtil.pm
branches/upstream/libio-compress-base-perl/current/t/compress/destroy.pl
branches/upstream/libio-compress-base-perl/current/t/compress/generic.pl
Modified: branches/upstream/libio-compress-base-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/Changes?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/Changes (original)
+++ branches/upstream/libio-compress-base-perl/current/Changes Wed Jul 16 17:10:23 2008
@@ -1,6 +1,17 @@
CHANGES
-------
+
+ 2.012 15 July 2008
+
+ * IO::Compress::Base
+ - Silenced an uninitialised value warning when reading a line
+ at a time from a zip file where the content uses ZIP_CM_STORE.
+ [Problem spotted & fixed by Jeff Holt]
+
+ * IO::Compress::Base & IO::Uncompress::Base
+ - local-ise $!, $? et al in the DESTROY methods.
+
2.011 17 May 2008
* IO::Compress::Base
Modified: branches/upstream/libio-compress-base-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/META.yml?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/META.yml (original)
+++ branches/upstream/libio-compress-base-perl/current/META.yml Wed Jul 16 17:10:23 2008
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: IO-Compress-Base
-version: 2.011
+version: 2.012
abstract: Base Class for IO::Compress modules
license: perl
author:
Modified: branches/upstream/libio-compress-base-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/README?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/README (original)
+++ branches/upstream/libio-compress-base-perl/current/README Wed Jul 16 17:10:23 2008
@@ -1,9 +1,9 @@
IO-Compress-Base
- Version 2.011
+ Version 2.012
- 17th May 2008
+ 15th July 2008
Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
@@ -76,7 +76,7 @@
If you haven't installed IO-Compress-Base then search IO::Compress::Base.pm
for a line like this:
- $VERSION = "2.011" ;
+ $VERSION = "2.012" ;
2. If you are having problems building IO-Compress-Base, send me a
complete log of what happened. Start by unpacking the IO-Compress-Base
Modified: branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base.pm?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base.pm (original)
+++ branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base.pm Wed Jul 16 17:10:23 2008
@@ -6,7 +6,7 @@
use strict ;
use warnings;
-use IO::Compress::Base::Common 2.011 ;
+use IO::Compress::Base::Common 2.012 ;
use IO::File ;
use Scalar::Util qw(blessed readonly);
@@ -20,7 +20,7 @@
our (@ISA, $VERSION);
@ISA = qw(Exporter IO::File);
-$VERSION = '2.011';
+$VERSION = '2.012';
#Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16.
@@ -547,6 +547,8 @@
sub DESTROY
{
my $self = shift ;
+ local ($., $@, $!, $^E, $?);
+
$self->close() ;
# TODO - memory leak with 5.8.0 - this isn't called until
@@ -975,4 +977,3 @@
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
-
Modified: branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base/Common.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base/Common.pm?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base/Common.pm (original)
+++ branches/upstream/libio-compress-base-perl/current/lib/IO/Compress/Base/Common.pm Wed Jul 16 17:10:23 2008
@@ -11,7 +11,7 @@
require Exporter;
our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
@ISA = qw(Exporter);
-$VERSION = '2.011';
+$VERSION = '2.012';
@EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput
isaFileGlobString cleanFileGlobString oneTarget
Modified: branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/AnyUncompress.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/AnyUncompress.pm?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/AnyUncompress.pm (original)
+++ branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/AnyUncompress.pm Wed Jul 16 17:10:23 2008
@@ -4,16 +4,16 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.011 qw(createSelfTiedObject);
-
-use IO::Uncompress::Base 2.011 ;
+use IO::Compress::Base::Common 2.012 qw(createSelfTiedObject);
+
+use IO::Uncompress::Base 2.012 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
-$VERSION = '2.011';
+$VERSION = '2.012';
$AnyUncompressError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,18 +27,18 @@
BEGIN
{
- eval ' use IO::Uncompress::Adapter::Inflate 2.011 ;';
- eval ' use IO::Uncompress::Adapter::Bunzip2 2.011 ;';
- eval ' use IO::Uncompress::Adapter::LZO 2.011 ;';
- eval ' use IO::Uncompress::Adapter::Lzf 2.011 ;';
-
- eval ' use IO::Uncompress::Bunzip2 2.011 ;';
- eval ' use IO::Uncompress::UnLzop 2.011 ;';
- eval ' use IO::Uncompress::Gunzip 2.011 ;';
- eval ' use IO::Uncompress::Inflate 2.011 ;';
- eval ' use IO::Uncompress::RawInflate 2.011 ;';
- eval ' use IO::Uncompress::Unzip 2.011 ;';
- eval ' use IO::Uncompress::UnLzf 2.011 ;';
+ eval ' use IO::Uncompress::Adapter::Inflate 2.012 ;';
+ eval ' use IO::Uncompress::Adapter::Bunzip2 2.012 ;';
+ eval ' use IO::Uncompress::Adapter::LZO 2.012 ;';
+ eval ' use IO::Uncompress::Adapter::Lzf 2.012 ;';
+
+ eval ' use IO::Uncompress::Bunzip2 2.012 ;';
+ eval ' use IO::Uncompress::UnLzop 2.012 ;';
+ eval ' use IO::Uncompress::Gunzip 2.012 ;';
+ eval ' use IO::Uncompress::Inflate 2.012 ;';
+ eval ' use IO::Uncompress::RawInflate 2.012 ;';
+ eval ' use IO::Uncompress::Unzip 2.012 ;';
+ eval ' use IO::Uncompress::UnLzf 2.012 ;';
}
sub new
@@ -56,7 +56,7 @@
sub getExtraParams
{
- use IO::Compress::Base::Common 2.011 qw(:Parse);
+ use IO::Compress::Base::Common 2.012 qw(:Parse);
return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ;
}
Modified: branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/Base.pm?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/Base.pm (original)
+++ branches/upstream/libio-compress-base-perl/current/lib/IO/Uncompress/Base.pm Wed Jul 16 17:10:23 2008
@@ -9,12 +9,12 @@
@ISA = qw(Exporter IO::File);
-$VERSION = '2.011';
+$VERSION = '2.012';
use constant G_EOF => 0 ;
use constant G_ERR => -1 ;
-use IO::Compress::Base::Common 2.011 ;
+use IO::Compress::Base::Common 2.012 ;
#use Parse::Parameters ;
use IO::File ;
@@ -856,7 +856,7 @@
$self->postBlockChk($buffer, $before_len) == STATUS_OK
or return G_ERR;
- $buf_len = length($$buffer) - $before_len;
+ $buf_len = defined $$buffer ? length($$buffer) - $before_len : 0;
*$self->{CompSize}->add($beforeC_len - length $temp_buf) ;
@@ -1290,6 +1290,8 @@
sub DESTROY
{
my $self = shift ;
+ local ($., $@, $!, $^E, $?);
+
$self->close() ;
}
@@ -1451,4 +1453,3 @@
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
-
Modified: branches/upstream/libio-compress-base-perl/current/private/MakeUtil.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/private/MakeUtil.pm?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/private/MakeUtil.pm (original)
+++ branches/upstream/libio-compress-base-perl/current/private/MakeUtil.pm Wed Jul 16 17:10:23 2008
@@ -49,6 +49,11 @@
my @files = getPerlFiles('MANIFEST');
+ # Note: Once you remove all the layers of shell/makefile escaping
+ # the regular expression below reads
+ #
+ # /^\s*local\s*\(\s*\$^W\s*\)/
+ #
my $postamble = '
MyTrebleCheck:
Modified: branches/upstream/libio-compress-base-perl/current/t/compress/destroy.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/t/compress/destroy.pl?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/t/compress/destroy.pl (original)
+++ branches/upstream/libio-compress-base-perl/current/t/compress/destroy.pl Wed Jul 16 17:10:23 2008
@@ -17,7 +17,7 @@
$extra = 1
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- plan tests => 7 + $extra ;
+ plan tests => 15 + $extra ;
use_ok('IO::File') ;
}
@@ -73,6 +73,43 @@
ok anyUncompress($name) eq $hello ;
}
+
+ {
+ title "Testing DESTROY doesn't clobber \$! etc ";
+
+ my $lex = new LexFile my $name ;
+
+ my $out;
+ my $result;
+
+ {
+ ok my $z = new $CompressClass($name);
+ $z->write("abc") ;
+ $! = 22 ;
+
+ cmp_ok $!, '==', 22, ' $! is 22';
+ }
+
+ cmp_ok $!, '==', 22, " \$! has not been changed by $CompressClass destructor";
+
+
+ {
+ my $uncomp;
+ ok my $x = new $UncompressClass($name, -Append => 1) ;
+
+ my $len ;
+ 1 while ($len = $x->read($result)) > 0 ;
+
+ $! = 22 ;
+
+ cmp_ok $!, '==', 22, ' $! is 22';
+ }
+
+ cmp_ok $!, '==', 22, " \$! has not been changed by $UncompressClass destructor";
+
+ is $result, "abc", " Got uncompressed content ok";
+
+ }
}
1;
Modified: branches/upstream/libio-compress-base-perl/current/t/compress/generic.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-compress-base-perl/current/t/compress/generic.pl?rev=23295&op=diff
==============================================================================
--- branches/upstream/libio-compress-base-perl/current/t/compress/generic.pl (original)
+++ branches/upstream/libio-compress-base-perl/current/t/compress/generic.pl Wed Jul 16 17:10:23 2008
@@ -118,6 +118,7 @@
}
}
+
{
title "Testing $CompressClass and $UncompressClass";
More information about the Pkg-perl-cvs-commits
mailing list