kde-projects: Improve error message somewhat.

This improves the error message encountered with mal-formed XML in the
kde-projects database, at least a little bit.

BUG:304813
FIXED-IN:1.16
wilder
Michael Pyne 13 years ago
parent 18b1e3bc87
commit 8ad8eacadf
  1. 9
      kdesrc-build
  2. 4
      modules/ksb/KDEXMLReader.pm

@ -860,9 +860,14 @@ sub expandXMLModules
return @xmlResults;
};
my @results = map { &$filter($_) } (@modules);
# eval in case the XML processor throws an exception.
undef $@;
my @results = eval { map { &$filter($_) } (@modules) };
if ($repositoryMetadataRequired) {
if ($@) {
croak_runtime("The XML for the KDE Project database could not be understood: $@");
}
elsif ($repositoryMetadataRequired) {
my $repoMetadataModule = ksb::Module->new($ctx, 'kde-build-metadata');
$repoMetadataModule->setScmType('metadata');

@ -70,7 +70,9 @@ sub getModulesForProject
},
);
my $result = $parser->parse($self->inputHandle());
# Will die if the XML is not well-formed.
$parser->parse($self->inputHandle());
return @modules;
}

Loading…
Cancel
Save