[Jifty-commit] r5098 - in Net-Jifty: .
Jifty commits
jifty-commit at lists.jifty.org
Mon Feb 11 19:26:23 EST 2008
Author: sartak
Date: Mon Feb 11 19:26:22 2008
New Revision: 5098
Modified:
Net-Jifty/ (props changed)
Net-Jifty/lib/Net/Jifty.pm
Log:
r51769 at onn: sartak | 2008-02-11 19:26:18 -0500
filter_config fixes
Modified: Net-Jifty/lib/Net/Jifty.pm
==============================================================================
--- Net-Jifty/lib/Net/Jifty.pm (original)
+++ Net-Jifty/lib/Net/Jifty.pm Mon Feb 11 19:26:22 2008
@@ -784,13 +784,13 @@
my $dir = dir(shift || getcwd);
- my $old_behavior = Hash::Merge::behavior;
+ my $old_behavior = Hash::Merge::get_behavior;
Hash::Merge::set_behavior('RIGHT_PRECEDENT');
while (1) {
- my $file = $dir->file( $self->filter_file );
+ my $file = $dir->file( $self->filter_file )->stringify;
- if (-e $file && -r _) {
+ if (-r $file) {
my $this_config = YAML::LoadFile($file);
$all_config = Hash::Merge::merge($this_config, $all_config);
}
More information about the Jifty-commit
mailing list