Skip to content
Snippets Groups Projects
Unverified Commit a87bc535 authored by Niels Thykier's avatar Niels Thykier
Browse files

jh_linkjars: Fix bug with multiple dep fields and newlines


Signed-off-by: default avatarNiels Thykier <niels@thykier.net>
parent c8e55527
No related branches found
No related tags found
No related merge requests found
javatools (0.67) UNRELEASED; urgency=medium
* jh_installibs: Fix error when jar file symlink already exist.
* jh_linkjars: Handle multiple dependency fields and newlines in
them more gracefully.
-- Niels Thykier <niels@thykier.net> Fri, 21 Sep 2018 16:02:23 +0000
......
......@@ -73,11 +73,13 @@ init(options => {
sub parse_deps_fields {
my ($field) = @_;
my @packages;
$field =~ s/^\s++//;
$field =~ s/\s++$//;
$field =~ s/\r?\n/,/g;
$field =~ s/^\s*+,?//;
$field =~ s/,?\s*+$//;
for my $clause (split(m/\s*+[,|]\s*+/, $field)) {
next if $clause =~ m/^\s*$/;
# Drop everything after [, ( or <.
$clause =~ s/\s*+[\(\[\<].*$//;
$clause =~ s/\s*+[[<(].*$//;
push(@packages, $clause);
}
return @packages;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment