At 2008-09-07 12:50:56 -0400, neoeinstein@xxxxxxxxx wrote:
>
> As I was the one who brought File::Temp->new over from git-svn, I can
> take a look at reducing the dependency to ->tempfile. If you don't
> patch in first, I'll get one in as well.
Please do.
Here's my latest patch, in case you find it useful as a starting point.
I do not have more time or inclination to work on this at the moment.
The problem with this patch is that the caller (git-svn in this case)
assumes that a File::Temp object will be returned, and depends on the
OO interface (e.g. by calling $tmp_fh->filename).
Unfortunately, I do not think the problem is limited to filename(). I
blessed $$temp_fd into a stub package that provided a fake filename()
method, but t9100-git-svn-basic.sh failed a little further on, and I
did not investigate further. Anyway, I don't think emulating the
File::Temp OO interface is a good solution at all.
(Tom: I'm sorry I ran out of energy before I could put together a
complete fix for you.)
-- ams
From: Abhijit Menon-Sen <ams@xxxxxxxxxx>
Date: Mon, 8 Sep 2008 12:26:59 +0530
Subject: [PATCH] Git.pm: Use File::Temp->tempfile instead of ->new
Perl 5.8.0 ships with File::Temp 0.13, which does not have the new()
interface introduced in 0.14, as pointed out by Tom G. Christensen.
Signed-off-by: Abhijit Menon-Sen <ams@xxxxxxxxxx>
---
perl/Git.pm | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/perl/Git.pm b/perl/Git.pm
index 102e6a4..b0498ca 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -991,7 +991,7 @@ the same string.
sub temp_release {
my ($self, $temp_fd, $trunc) = _maybe_self(@_);
- if (ref($temp_fd) ne 'File::Temp') {
+ if (exists $TEMP_FILES{$temp_fd}) {
$temp_fd = $TEMP_FILES{$temp_fd};
}
unless ($TEMP_LOCKS{$temp_fd}) {
@@ -1021,10 +1021,13 @@ sub _temp_cache {
carp "Temp file '", $name,
"' was closed. Opening replacement.";
}
- $$temp_fd = File::Temp->new(
- TEMPLATE => 'Git_XXXXXX',
- DIR => File::Spec->tmpdir
- ) or throw Error::Simple("couldn't open new temp file");
+ eval {
+ ($$temp_fd) = File::Temp->tempfile(
+ 'Git_XXXXXX',
+ DIR => File::Spec->tmpdir
+ );
+ };
+ throw Error::Simple("couldn't open new temp file") if $@;
$$temp_fd->autoflush;
binmode $$temp_fd;
}
--
1.6.0.1.196.g01914
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
