Author: stas
Date: Mon May 9 15:33:23 2005
New Revision: 169370
URL: http://svn.apache.org/viewcvs?rev=169370&view=rev
Log:
more corrections of the diagnostics of the pre RC5 install:
- get the reported conflicting directory right
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/Makefile.PL
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=169370&r1=169369&r2=169370&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon May 9 15:33:23 2005
@@ -26,7 +26,8 @@
Makefile.PL: fix the pre-rename mp2 install diagnostics code, to use
the mp version of 1.999xx and not 1.999_xx, as the latter is
-unsuitable for numerical comparison [Stas].
+unsuitable for numerical comparison, also fix the name of the reported
+conflicting directory [Stas].
add APR::Status::is_(EACCES|ENOENT), and use in ModPerl::RegistryCooker
to return, as appropriate, Apache2::Const::(FORBIDDEN|NOT_FOUND),
Modified: perl/modperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?rev=169370&r1=169369&r2=169370&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Mon May 9 15:33:23 2005
@@ -30,7 +30,7 @@
use File::Spec;
use DirHandle ();
use File::Copy 'cp';
-use File::Basename 'basename';
+use File::Basename qw(basename dirname);
use File::Find ();
use Apache2::Build ();
@@ -144,17 +144,15 @@
"no collision)\n";
}
else {
- my @files = ();
- my @dirs = ();
- push @files, $old_Apache2_pm if $old_Apache2_pm;
- push @dirs, $path
- if $path =~ /Apache2/ or $old_modperl_version > 1.99;
-
my $note = '';
- if (@files || @dirs) {
- $note = "Problematic\n";
- $note .= "files: @files\n" if @files;
- $note .= "dirs: @dirs\n" if @dirs;
+ if ($old_Apache2_pm) {
+ $note .= "Conflicting file: $old_Apache2_pm\n";
+ }
+ if ($path =~ /Apache2/ or $old_modperl_version > 1.99) {
+ my $dir = dirname $path;
+ # was it installed into the top-level?
+ $dir = catdir $dir, 'Apache' unless $path =~ /Apache2/;
+ $note .= "Conflicting dir: $dir\n" if -d $dir;
}
print " not ok\n\n";
@@ -165,7 +163,7 @@
$note
Please nuke the prior mod_perl installation from your site_lib,
use a different perl to run the installation process, or use the
-PREFIX option when creating your Makefile. see
+PREFIX option when creating your Makefile. See:
http://perl.apache.org/docs/2.0/rename.html
