You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ph...@apache.org on 2009/04/26 00:52:54 UTC
svn commit: r768621 - in /perl/Apache-Bootstrap/trunk: Changes
lib/Apache/Bootstrap.pm
Author: phred
Date: Sat Apr 25 22:52:54 2009
New Revision: 768621
URL: http://svn.apache.org/viewvc?rev=768621&view=rev
Log:
Change prereq logic from and to or, to allow only one version of
mod_perl to be present for A::B supported modules.
Modified:
perl/Apache-Bootstrap/trunk/Changes
perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm
Modified: perl/Apache-Bootstrap/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Bootstrap/trunk/Changes?rev=768621&r1=768620&r2=768621&view=diff
==============================================================================
--- perl/Apache-Bootstrap/trunk/Changes (original)
+++ perl/Apache-Bootstrap/trunk/Changes Sat Apr 25 22:52:54 2009
@@ -1,6 +1,8 @@
Revision history for Apache-Bootstrap
0.07-dev
+ - Prerequisites are now or instead of and, since we need to support
+ mp1 only installations
0.06 Sat Apr 25 14:07:04 PST 2009
- replace confusing instances of mod_perl1 and mp1 with simply mod_perl
Modified: perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm?rev=768621&r1=768620&r2=768621&view=diff
==============================================================================
--- perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm (original)
+++ perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm Sat Apr 25 22:52:54 2009
@@ -108,9 +108,7 @@
$self{mod_perl} = $mod_perl::VERSION;
}
- }
-
- if ( defined $args->{mod_perl2} ) {
+ } elsif ( defined $args->{mod_perl2} ) {
# look for mp2
eval { require mod_perl2 };