equal
deleted
inserted
replaced
120 $characters =~ s,[\r\n]*$,,; |
120 $characters =~ s,[\r\n]*$,,; |
121 |
121 |
122 my $package = ''; |
122 my $package = ''; |
123 # if bldinf attribute is not available then heuristically attempt to determine the package |
123 # if bldinf attribute is not available then heuristically attempt to determine the package |
124 if (!$raptor_warning_info->{bldinf} && |
124 if (!$raptor_warning_info->{bldinf} && |
125 $characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s) |
125 $characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s) |
126 { |
126 { |
127 $raptor_warning_info->{bldinf} = "$1... (guessed)"; |
127 $raptor_warning_info->{bldinf} = "$1... (guessed)"; |
128 } |
128 } |
129 |
129 |
130 if ($raptor_warning_info->{bldinf}) |
130 if ($raptor_warning_info->{bldinf}) |
134 # normalize bldinf path |
134 # normalize bldinf path |
135 $raptor_warning_info->{bldinf} = lc($raptor_warning_info->{bldinf}); |
135 $raptor_warning_info->{bldinf} = lc($raptor_warning_info->{bldinf}); |
136 $raptor_warning_info->{bldinf} =~ s,^[A-Za-z]:,,; |
136 $raptor_warning_info->{bldinf} =~ s,^[A-Za-z]:,,; |
137 $raptor_warning_info->{bldinf} =~ s,[\\],/,g; |
137 $raptor_warning_info->{bldinf} =~ s,[\\],/,g; |
138 |
138 |
139 if ($raptor_warning_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[^/]*),) |
139 if ($raptor_warning_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),) |
140 { |
140 { |
141 $package = $1; |
141 $package = $1; |
142 $package =~ s,/,_,; |
142 $package =~ s,/,_,; |
143 } |
143 } |
144 else |
144 else |