[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bricolage-commits
Subject:    [6627] Added DBD::mysql to the modules.
From:       tamas () bricolage ! cc
Date:       2005-08-31 10:23:54
Message-ID: 20050831102354.3257.qmail () x1 ! develooper ! com
[Download RAW message or body]

Revision: 6627
Author:   tamas
Date:     2005-08-31 03:23:52 -0700 (Wed, 31 Aug 2005)
ViewCVS:  http://viewsvn.bricolage.cc/?rev=6627&view=rev

Log Message:
-----------
Added DBD::mysql to the modules.

Modified Paths:
--------------
    bricolage/branches/dev_mysql/inst/cpan.pl



["r6627-tamas.diff" (r6627-tamas.diff)]

Modified: bricolage/branches/dev_mysql/inst/cpan.pl
===================================================================
--- bricolage/branches/dev_mysql/inst/cpan.pl	2005-08-31 10:08:25 UTC (rev 6626)
+++ bricolage/branches/dev_mysql/inst/cpan.pl	2005-08-31 10:23:52 UTC (rev 6627)
@@ -98,6 +98,7 @@
 use Bric::Inst qw(:all);
 use Data::Dumper;
 use Config;
+use Bric::Config;
 use CPAN;
 
 # make sure this is a recent version of CPAN.pm.  The stuff we're doing
@@ -134,13 +135,20 @@
 	      'LWP'              => FORCE,
 	      'XML::Writer'      => FORCE,
 	      'Params::Validate' => FORCE,
-	      'DBD::Pg'          => FORCE|PG_ENV,
 	      'Cache::Cache'     => FORCE,
 	      'HTML::Mason'      => FORCE,
+	      #'DBD::Pg'          => FORCE|PG_ENV,
 	     );
 
+our $DBD_TYPE;
+
+$DBD_TYPE eq 'mysql' ? $flags{'DBD::mysql'} = 'FORCE|PG_ENV' : $flags{'DBD::Pg'} = 'FORCE';
+
 our $PG;
-do "./postgres.db" or die "Failed to read postgres.db : $!";
+our $MY;
+-e "./postgres.db" ? do "./postgres.db" : { 
+    -e "./mysql.db" ? do "./mysql.db" : 
+    die "Failed to read postgres.db or mysql.db: $!" };
 
 # loop through modules installing as we go
 for my $i (0 .. $#$MOD) {
@@ -188,7 +196,7 @@
 	$m->force('install') if $flags{$key} and $flags{$key} & FORCE;
 
 	# need PG env vars?
-	if ($flags{$key} and $flags{$key} & PG_ENV) {
+	if ($DBD_TYPE eq 'Pg' and $flags{$key} and $flags{$key} & PG_ENV) {
 	    $ENV{POSTGRES_INCLUDE} = $PG->{include_dir};
 	    $ENV{POSTGRES_LIB}     = $PG->{lib_dir};
 	}


[prev in list] [next in list] [prev in thread] [next in thread]