adds $db_engine in configmanager so we can avoid hardcoding of mysql.
--
Olivier LAHAYE
CEA Saclay
DRT-LIST-DETECS-SSTM
--- /root/oscar/lib/OSCAR/ConfigManager.pm 2009-12-02 10:46:28.000000000 +0100
+++ /usr/lib/perl5/vendor_perl/5.8.8/OSCAR/ConfigManager.pm 2009-12-02 11:50:27.000000000 +0100
@@ -48,6 +48,8 @@
our $oscarbinaries_path;
# Specify the db type (flat files or real db)
our $db_type;
+# Specify the db engine (mysql, postgresql or any other)
+our $db_engine;
# Specify the prereq management mode.
our $prereq_mode;
# Specify where the OPKGs are.
@@ -94,16 +96,17 @@
$config->file ($config_file);
# Load configuration values
- $rapt_path = $config->get('RAPT_PATH');
- $yume_path = $config->get('YUME_PATH');
- $prereqs_path = $config->get('PREREQS_PATH');
- $packman_path = $config->get('PREREQS_PATH') . "/packman";
$nioscar = $config->get('OSCAR_NETWORK_INTERFACE');
$oscarbinaries_path = $config->get('OSCAR_SCRIPTS_PATH');
+ $prereqs_path = $config->get('PREREQS_PATH');
+ $packman_path = $config->get('PREREQS_PATH') . "/packman";
+ $rapt_path = $config->get('RAPT_PATH');
+ $yume_path = $config->get('YUME_PATH');
$db_type = $config->get('ODA_TYPE');
+ $db_engine = $config->get('DB_TYPE');
$prereq_mode = $config->get('PREREQ_MODE');
- $oda_files_path = $config->get('PATH_ODA_CONFIG_FILES');
$opkgs_path = $config->get('OPKGS_PATH');
+ $oda_files_path = $config->get('PATH_ODA_CONFIG_FILES');
}
sub get_config () {
@@ -116,6 +119,7 @@
'nioscar' => $nioscar,
'binaries_path' => $oscarbinaries_path,
'db_type' => $db_type,
+ 'db_engine' => $db_engine,
'prereq_mode' => $prereq_mode,
'oda_files_path' => $oda_files_path,
'opkgs_path' => $opkgs_path,
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Oscar-devel mailing list
Oscar-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oscar-devel
