[Git][java-team/javatools][master] jh_linkjars: Fix a dependency parsing issue

[Niels Thykier]

Niels Thykier pushed to branch master at Debian Java Maintainers / javatools


Commits:
85e9f5f8 by Niels Thykier at 2018-10-03T05:58:36Z
jh_linkjars: Fix a dependency parsing issue

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- jh_linkjars


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,9 @@
 javatools (0.69) UNRELEASED; urgency=medium
 
   * jh_installjavadoc: Parse debian/javadoc file correctly.
+  * jh_linkjars: Fix regression in handling of whitespace in the
+    dependency fields.  Thanks to Markus Koschany for reporting
+    the issue.  (Closes: #910112)
 
  -- Niels Thykier <niels at thykier.net>  Mon, 01 Oct 2018 16:59:42 +0000
 


=====================================
jh_linkjars
=====================================
@@ -73,9 +73,10 @@ init(options => {
 sub parse_deps_fields {
     my ($field) = @_;
     my @packages;
-    $field =~ s/\r?\n/,/g;
     $field =~ s/^\s*+,?//;
     $field =~ s/,?\s*+$//;
+    $field =~ s/\r?\n/,/g;
+    $field =~ s/,(?:\s*,)++\s*+/,/g;
     for my $clause (split(m/\s*+[,|]\s*+/, $field)) {
         next if $clause =~ m/^\s*$/;
         # Drop everything after [, ( or <.



View it on GitLab: https://salsa.debian.org/java-team/javatools/commit/85e9f5f89d853e471147ef5b44716d0e4ec28409

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/commit/85e9f5f89d853e471147ef5b44716d0e4ec28409
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181003/a1263386/attachment.html>