Change 15200 by ams@lustre on 2002/03/12 15:16:05
Subject: Disambiguate "Can't locate"
From: Mike Guy <[EMAIL PROTECTED]>
Date: Tue, 12 Mar 2002 16:04:23 +0000
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/lib/AutoSplit.t#12 edit
.... //depot/perl/lib/Test/Simple/t/fail-more.t#7 edit
.... //depot/perl/pod/perldiag.pod#281 edit
.... //depot/perl/pp_ctl.c#309 edit
.... //depot/perl/t/op/override.t#5 edit
Differences ...
==== //depot/perl/lib/AutoSplit.t#12 (text) ====
Index: perl/lib/AutoSplit.t
--- perl/lib/AutoSplit.t.~1~ Tue Mar 12 08:30:06 2002
+++ perl/lib/AutoSplit.t Tue Mar 12 08:30:06 2002
@@ -336,7 +336,7 @@
*DIR*/*MOD*/flying_pig.al
## Tests
is (&*MOD*::skeleton, "bones", "skeleton");
-eval {&*MOD*::gonner}; ok ($@ =~ m!^Can't locate auto/*MOD*/gonner.al in \@INC!,
"Check &*MOD*::gonner is now a gonner") or print "# \$\@='$@'\n";
+eval {&*MOD*::gonner}; ok ($@ =~ m!^Can't locate file auto/*MOD*/gonner.al in \@INC!,
+"Check &*MOD*::gonner is now a gonner") or print "# \$\@='$@'\n";
## Sleep
4
## SameAgain
@@ -408,4 +408,4 @@
*DIR*/*MOD*/wraith.al
## Tests
is (&*MOD*::wraith, 9);
-eval {&*MOD*::flying_pig}; ok ($@ =~ m!^Can't locate auto/*MOD*/flying_pig.al in
\@INC!, "There are no flying pigs") or print "# \$\@='$@'\n";
+eval {&*MOD*::flying_pig}; ok ($@ =~ m!^Can't locate file auto/*MOD*/flying_pig.al in
+\@INC!, "There are no flying pigs") or print "# \$\@='$@'\n";
==== //depot/perl/lib/Test/Simple/t/fail-more.t#7 (text) ====
Index: perl/lib/Test/Simple/t/fail-more.t
--- perl/lib/Test/Simple/t/fail-more.t.~1~ Tue Mar 12 08:30:06 2002
+++ perl/lib/Test/Simple/t/fail-more.t Tue Mar 12 08:30:06 2002
@@ -207,10 +207,10 @@
my $more_err_re = <<ERR;
# Failed test \\($filename at line 84\\)
# Tried to use 'Hooble::mooble::yooble'.
-# Error: Can't locate Hooble.* in \\\@INC .*
+# Error: Can't locate file Hooble.* in \\\@INC .*
# Failed test \\($filename at line 85\\)
# Tried to require 'ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble'.
-# Error: Can't locate ALL.* in \\\@INC .*
+# Error: Can't locate file ALL.* in \\\@INC .*
# Looks like you failed $Total tests of $Total.
ERR
==== //depot/perl/pod/perldiag.pod#281 (text) ====
Index: perl/pod/perldiag.pod
--- perl/pod/perldiag.pod.~1~ Tue Mar 12 08:30:06 2002
+++ perl/pod/perldiag.pod Tue Mar 12 08:30:06 2002
@@ -785,7 +785,7 @@
pointed to after the scope of the local() is finished, it can't be sure
that $ref will still be a reference.
-=item Can't locate %s
+=item Can't locate file %s
(F) You said to C<do> (or C<require>, or C<use>) a file that couldn't be
found. Perl looks for the file in all the locations mentioned in @INC,
==== //depot/perl/pp_ctl.c#309 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c.~1~ Tue Mar 12 08:30:06 2002
+++ perl/pp_ctl.c Tue Mar 12 08:30:06 2002
@@ -3155,7 +3155,7 @@
SvREFCNT_dec(dirmsgsv);
msgstr = SvPV_nolen(msg);
}
- DIE(aTHX_ "Can't locate %s", msgstr);
+ DIE(aTHX_ "Can't locate file %s", msgstr);
}
RETPUSHUNDEF;
==== //depot/perl/t/op/override.t#5 (xtext) ====
Index: perl/t/op/override.t
--- perl/t/op/override.t.~1~ Tue Mar 12 08:30:06 2002
+++ perl/t/op/override.t Tue Mar 12 08:30:06 2002
@@ -67,7 +67,7 @@
local(*CORE::GLOBAL::require);
$r = '';
eval "require NoNeXiSt;";
- print "not " if $r or $@ !~ /^Can't locate NoNeXiSt/i;
+ print "not " if $r or $@ !~ /^Can't locate file NoNeXiSt/i;
print "ok 11\n";
}
End of Patch.
