Changeset 2888

Show
Ignore:
Timestamp:
08/02/08 23:02:16 (4 months ago)
Author:
bchoate
Message:

Improved error reporting for invalid yaml files (thanks, Jay). BugId:78680

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-42/lib/MT/Component.pm

    r2668 r2888  
    154154    require YAML::Tiny; 
    155155    my $y = eval { YAML::Tiny->read($path) } 
    156         or die "Error reading $path: " . $YAML::Tiny::errstr; 
     156        or die "Error reading $path: " . (YAML::Tiny->errstr||$@||$!); 
    157157    if ( ref($y) ) { 
    158158 
    …… 
    521521                            require YAML::Tiny; 
    522522                            my $y = eval { YAML::Tiny->read($f) } 
    523                                 or die "Error reading $f: " 
    524                                     . $YAML::Tiny::errstr; 
     523                                or die "Error reading $f: " . (YAML::Tiny->errstr||$@||$!); 
    525524                            # skip over non-hash elements 
    526525                            shift @$y