Patch from Robert Soulliere to backport Class::DBI version checking from 2.0: https...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@19098 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index f0f3181..eb50125 100644 (file)
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -229,6 +229,9 @@ CPAN_MODULES_MARC = \
     MARC::File::XML \
     Net::Z3950::ZOOM
 
+CPAN_MODULES_FORCE = \
+       Class::DBI::Frozen::301
+
 # ----------------------------------------------------------------------------
 
 all: 
@@ -267,6 +270,12 @@ install_cpan:
 install_cpan_marc: 
        for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done
 
+# Force Install CPAN modules.
+install_cpan_force:
+       for m in $(CPAN_MODULES_FORCE); do \
+               echo "force install $$m" | perl -MCPAN -e shell ;\
+       done  
+
 # Install a known working version of YAZ
 install_yaz:    
        if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi;

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
index 419179c..80801a2 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
@@ -1,6 +1,10 @@
 package OpenILS::Application::Storage::CDBI;
+use UNIVERSAL::require;
+BEGIN {
+       'Class::DBI::Frozen::301'->use or 'Class::DBI'->use or die $@;
+}
+
 use base qw/Class::DBI/;
-use Class::DBI;
 use Class::DBI::AbstractSearch;
 
 use OpenILS::Application::Storage::CDBI::actor;
@@ -22,6 +26,10 @@ use OpenSRF::EX qw/:try/;
 our $VERSION = 1;
 my $log = 'OpenSRF::Utils::Logger';
 
+if ($Class::DBI::VERSION gt '3.0.1') {
+       $log->error("Your version of Class::DBI, $Class::DBI::VERSION, is too new and incompatible with Evergreen. You will need to downgrade to version 3.0.1 or install Class::DBI::Frozen::301");
+}
+
 sub child_init {
        my $self = shift;