Re: [PATCH 5.10] Improve diagnostic for reloads of bad modules

Message-ID: <20070922203040.GK11931@bort.ca>

p4raw-id: //depot/perl@31965

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 9123a012676639a948eadf300f71d9d8df07713c..1d2650fdc189276feaa308f3fe916ce1bbbf36aa 100644 (file)
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -282,6 +282,13 @@ invalid anytime, even before the end of the current statement.  Use
 literals or global values as arguments to the "p" pack() template to
 avoid this warning.
 
+=item Attempt to reload %s aborted.
+
+(F) You tried to load a file with C<use> or C<require> that failed to
+compile once already.  Perl will not try to compile this file again
+unless you delete its entry from %INC.  See L<perlfunc/require> and
+L<perlvar/%INC>.
+
 =item Attempt to set length of freed array
 
 (W) You tried to set the length of an array which has been freed.  You

diff --git a/pp_ctl.c b/pp_ctl.c
index ba0a503aca70de49af22a1585096e5276eb226a6..7ecae350bae8de83389b436edf6a49bab6022529 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3149,7 +3149,8 @@ PP(pp_require)
            if (*svp != &PL_sv_undef)
                RETPUSHYES;
            else
-               DIE(aTHX_ "Compilation failed in require");
+               DIE(aTHX_ "Attempt to reload %s aborted.\n"
+                           "Compilation failed in require", unixname);
        }
     }