commit 8c711ac722100ff2532454a3cbce75729604503c Author: Alexey Tourbin Date: Wed Sep 15 15:26:28 2010 +0400 perlbug.PL: adjust dependencies diff --git a/utils/perlbug.PL b/utils/perlbug.PL index 885785a..b2f9ad0 100644 --- a/utils/perlbug.PL +++ b/utils/perlbug.PL @@ -67,14 +67,11 @@ use File::Basename 'basename'; sub paraprint; BEGIN { - eval { require Mail::Send;}; + eval "require Mail::Send;"; $::HaveSend = ($@ eq ""); - eval { require Mail::Util; } ; + eval "require Mail::Util;"; $::HaveUtil = ($@ eq ""); - # use secure tempfiles wherever possible - eval { require File::Temp; }; - $::HaveTemp = ($@ eq ""); - eval { require Module::CoreList; }; + eval "require Module::CoreList;"; $::HaveCoreList = ($@ eq ""); }; @@ -983,18 +980,10 @@ EOF } sub filename { - if ($::HaveTemp) { - # Good. Use a secure temp file - my ($fh, $filename) = File::Temp::tempfile(UNLINK => 1); - close($fh); - return $filename; - } else { - # Bah. Fall back to doing things less securely. - my $dir = File::Spec->tmpdir(); - $filename = "bugrep0$$"; - $filename++ while -e File::Spec->catfile($dir, $filename); - $filename = File::Spec->catfile($dir, $filename); - } + require File::Temp; + my ($fh, $filename) = File::Temp::tempfile(UNLINK => 1); + close($fh); + return $filename; } sub paraprint {