ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 2010 UTC

1451 1451
1452 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1453 1453
1454 if (length $@) { 1454 if (length $@) {
1455 error "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1457 1456
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459 if exists $v->{meta}{mandatory}; 1458 if exists $v->{meta}{mandatory};
1460 1459
1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
3370 debug "loading perl module $mod\n"; 3369 debug "loading perl module $mod\n";
3371 } 3370 }
3372 3371
3373 # 1. find real file 3372 # 1. find real file
3374 for my $dir (@ORIG_INC) { 3373 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next; 3374 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data 3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next; 3376 or next;
3379 3377
3380 $data = "#line 1 $dir/$mod\n$data"; 3378 $data = "#line 1 $dir/$mod\n$data";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines