-----BEGIN PGP SIGNED MESSAGE-----
Moin,
attached patch loads Carp on demand for the aforementioned three modules.
All tests successful.
u=2.87 s=0.80 cu=186.18 cs=26.04 scripts=954 tests=107891
Although I think these patches are usefull, I'll stop until consens is
reached about whether they are usefull (I think so) or not. Makes no
sense to prepare them when they won't get applied.
Best wishes,
Tels
- --
Signed on Sun Jun 26 13:21:42 2005 with key 0x93B84C15.
Visit my photo gallery at http://bloodgate.com/photos/
PGP key on http://bloodgate.com/tels.asc or per email.
"Duke Nukem Forever will come out before Doom 3." - George Broussard,
2002 (http://tinyurl.com/6m8nh)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iQEVAwUBQr6ZRXcLPEOTuEwVAQH4Ogf9FJ0LERcwPrEOXQ6dZJcB30ttMQGW3fT5
878FS6OK1K6f/QQqSJdR63OKXlxAH0tNLNGukzQrKxtfrcd25+FvgyR5mA6sodK0
XfL6X/fBFkWiQbHKVv4GRgSkBvxR8B6kMce7ur48/Z1rpXPjlrjziYehmqzrLQwZ
14auPu3RFz4KIGPE5zQ1e/PWI8hpr0xGwPPEt8omCsalw9e+hC5uyFvEGOyH2KpU
2Eju9QSesKExh2hbp9E8tHdU9G5OpcOiFe9UHWxRGg6oXhViYhV47Z8OIIqPGefp
tbJeApjEZI4vNQpzeoalF87r9IBYBnNX14QDn+uJ6m/RRH8Td7tpXA==
=q/wb
-----END PGP SIGNATURE-----
diff -ruN blead.patch.5/lib/File/Compare.pm blead.patch.6/lib/File/Compare.pm
--- blead.patch.5/lib/File/Compare.pm 2002-04-03 16:58:14.000000000 +0200
+++ blead.patch.6/lib/File/Compare.pm 2005-06-26 13:17:07.000000000 +0200
@@ -6,15 +6,19 @@
our($VERSION, @ISA, @EXPORT, @EXPORT_OK, $Too_Big);
require Exporter;
-use Carp;
-$VERSION = '1.1003';
+$VERSION = '1.1004';
@ISA = qw(Exporter);
@EXPORT = qw(compare);
@EXPORT_OK = qw(cmp compare_text);
$Too_Big = 1024 * 1024 * 2;
+sub croak {
+ require Carp;
+ goto &Carp::croak;
+}
+
sub compare {
croak("Usage: compare( file1, file2 [, buffersize]) ")
unless(@_ == 2 || @_ == 3);
diff -ruN blead.patch.5/lib/File/Copy.pm blead.patch.6/lib/File/Copy.pm
--- blead.patch.5/lib/File/Copy.pm 2004-07-01 12:37:39.000000000 +0200
+++ blead.patch.6/lib/File/Copy.pm 2005-06-26 13:20:54.000000000 +0200
@@ -10,7 +10,6 @@
use 5.006;
use strict;
use warnings;
-use Carp;
use File::Spec;
use Config;
our(@ISA, @EXPORT, @EXPORT_OK, $VERSION, $Too_Big, $Syscopy_is_copy);
@@ -24,7 +23,7 @@
# package has not yet been updated to work with Perl 5.004, and so it
# would be a Bad Thing for the CPAN module to grab it and replace this
# module. Therefore, we set this module's version higher than 2.0.
-$VERSION = '2.08';
+$VERSION = '2.08_01';
require Exporter;
@ISA = qw(Exporter);
@@ -33,6 +32,11 @@
$Too_Big = 1024 * 1024 * 2;
+sub croak {
+ require Carp;
+ goto &Carp::croak;
+}
+
my $macfiles;
if ($^O eq 'MacOS') {
$macfiles = eval { require Mac::MoreFiles };
diff -ruN blead.patch.5/lib/File/Temp.pm blead.patch.6/lib/File/Temp.pm
--- blead.patch.5/lib/File/Temp.pm 2005-03-22 12:29:41.000000000 +0100
+++ blead.patch.6/lib/File/Temp.pm 2005-06-26 13:47:43.000000000 +0200
@@ -131,7 +131,6 @@
# People would like a version on 5.005 so give them what they want :-)
use 5.005;
use strict;
-use Carp;
use File::Spec 0.8;
use File::Path qw/ rmtree /;
use Fcntl 1.03;
@@ -183,7 +182,7 @@
# Version number
-$VERSION = '0.16';
+$VERSION = '0.16_01';
# This is a list of characters that can be used in random filenames
@@ -254,6 +253,16 @@
# INTERNAL ROUTINES - not to be used outside of package
+sub carp {
+ require Carp;
+ goto &Carp::carp;
+}
+
+sub croak {
+ require Carp;
+ goto &Carp::croak;
+}
+
# Generic routine for getting a temporary filename
# modelled on OpenBSD _gettemp() in mktemp.c
@@ -1910,7 +1919,8 @@
# this is no longer a file, but may be a directory, or worse
unless (-f $path) {
- confess "panic: $path is no longer a file: [EMAIL PROTECTED]";
+ require Carp;
+ Carp::confess ("panic: $path is no longer a file: [EMAIL PROTECTED]");
}
# Do comparison of each member of the array
