[Jifty-commit] r2695 - in jifty/branches/virtual-models: . lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sun Jan 28 10:59:56 EST 2007
Author: jesse
Date: Sun Jan 28 10:59:55 2007
New Revision: 2695
Modified:
jifty/branches/virtual-models/ (props changed)
jifty/branches/virtual-models/Makefile.PL
jifty/branches/virtual-models/lib/Jifty/Logger.pm
jifty/branches/virtual-models/lib/Jifty/Module/Pluggable.pm
Log:
Modified: jifty/branches/virtual-models/Makefile.PL
==============================================================================
--- jifty/branches/virtual-models/Makefile.PL (original)
+++ jifty/branches/virtual-models/Makefile.PL Sun Jan 28 10:59:55 2007
@@ -48,7 +48,7 @@
requires('Log::Log4perl');
requires('LWP::UserAgent'); # Net::HTTP
requires('MIME::Types');
-requires('Module::Pluggable' => '3.1');
+requires('Module::Pluggable' => '3.1'); # Module::Pluggable::Object
requires('Module::CoreList');
requires('Module::Refresh');
requires('Module::ScanDeps');
Modified: jifty/branches/virtual-models/lib/Jifty/Logger.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Logger.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Logger.pm Sun Jan 28 10:59:55 2007
@@ -122,6 +122,7 @@
# the aliasing so we can remove trailing newlines
my @lines = map {"$_"} @_;
$logger->warn(map {chomp; $_} @lines);
+ carp (map {chomp; $_} @lines);
}
elsif ($previous_warning_handler) {
# Fallback to the old handler
Modified: jifty/branches/virtual-models/lib/Jifty/Module/Pluggable.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Module/Pluggable.pm (original)
+++ jifty/branches/virtual-models/lib/Jifty/Module/Pluggable.pm Sun Jan 28 10:59:55 2007
@@ -39,6 +39,7 @@
use Module::Pluggable::Object;
+use UNIVERSAL::require;
sub Module::Pluggable::Object::_require {
my $self = shift;
my $module = shift;
@@ -46,11 +47,9 @@
# Module::Pluggable::Object::_require expects a true value (the error message) on failure
# On success, it expects you to return undef.
- if (!Jifty::Util->require($module) ) {
- return $UNIVERSAL::require::ERROR;
- } else {
- return undef;
- }
+ local $UNIVERSAL::require::ERROR = undef;
+ $module->require(); # We'd prefer to use Jifty::Util->require() here, but it spews crazy warnings
+ return $UNIVERSAL::require::ERROR;
}
More information about the Jifty-commit
mailing list