equal
deleted
inserted
replaced
188 $characters =~ s,[\r\n]*$,,; |
188 $characters =~ s,[\r\n]*$,,; |
189 |
189 |
190 my $package = ''; |
190 my $package = ''; |
191 # if bldinf attribute is not available then heuristically attempt to determine the package |
191 # if bldinf attribute is not available then heuristically attempt to determine the package |
192 if (!$raptor_error_info->{bldinf} && |
192 if (!$raptor_error_info->{bldinf} && |
193 $characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s) |
193 $characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s) |
194 { |
194 { |
195 $raptor_error_info->{bldinf} = "$1... (guessed)"; |
195 $raptor_error_info->{bldinf} = "$1... (guessed)"; |
196 } |
196 } |
197 |
197 |
198 if ($raptor_error_info->{bldinf}) |
198 if ($raptor_error_info->{bldinf}) |
202 # normalize bldinf path |
202 # normalize bldinf path |
203 $raptor_error_info->{bldinf} = lc($raptor_error_info->{bldinf}); |
203 $raptor_error_info->{bldinf} = lc($raptor_error_info->{bldinf}); |
204 $raptor_error_info->{bldinf} =~ s,^[A-Za-z]:,,; |
204 $raptor_error_info->{bldinf} =~ s,^[A-Za-z]:,,; |
205 $raptor_error_info->{bldinf} =~ s,[\\],/,g; |
205 $raptor_error_info->{bldinf} =~ s,[\\],/,g; |
206 |
206 |
207 if ($raptor_error_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[^/]*),) |
207 if ($raptor_error_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),) |
208 { |
208 { |
209 $package = $1; |
209 $package = $1; |
210 $package =~ s,/,_,; |
210 $package =~ s,/,_,; |
211 } |
211 } |
212 else |
212 else |