[Jifty-commit] r4225 - jifty/trunk/lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Oct 10 12:24:14 EDT 2007
Author: audreyt
Date: Wed Oct 10 12:24:11 2007
New Revision: 4225
Modified:
jifty/trunk/lib/Jifty/Config.pm
Log:
* The JIFTY_SITE_CONFIG environment variable was silently ignored.
Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm (original)
+++ jifty/trunk/lib/Jifty/Config.pm Wed Oct 10 12:24:11 2007
@@ -149,6 +149,9 @@
# Load the site configuration file
my $site = $self->load_file(
Jifty::Util->absolute_path(
+ # Note: $ENV{'JIFTY_SITE_CONFIG'} is already considered
+ # in ->_default_config_files(), but we || here again
+ # in case someone overrided _default_config_files().
$self->framework('SiteConfig') || $ENV{'JIFTY_SITE_CONFIG'}
)
);
@@ -225,7 +228,9 @@
my $self = shift;
my $config = {
framework => {
- SiteConfig => 'etc/site_config.yml'
+ SiteConfig => (
+ $ENV{JIFTY_SITE_CONFIG} || 'etc/site_config.yml'
+ )
}
};
return $self->_expand_relative_paths($config);
More information about the Jifty-commit
mailing list