[javatools] 01/05: Ignore the "unnamed package" generated by Java 9 in the javadoc package-list file when resolving the doc dependencies (Closes: #873252)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository javatools.

commit e55d8a5e713782fea77694b514805bab248687f9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 4 15:22:20 2017 +0100

    Ignore the "unnamed package" generated by Java 9 in the javadoc package-list file when resolving the doc dependencies (Closes: #873252)
---
 debian/changelog              | 8 ++++++++
 lib/Debian/Javahelper/Java.pm | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c37e481..0a931cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+javatools (0.62) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Ignore the "unnamed package" generated by Java 9 in the javadoc package-list
+    file when resolving the doc dependencies (Closes: #873252)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 04 Dec 2017 15:09:30 +0100
+
 javatools (0.61) unstable; urgency=medium
 
   * Team upload.
diff --git a/lib/Debian/Javahelper/Java.pm b/lib/Debian/Javahelper/Java.pm
index ca5bb3f..1d6c94f 100644
--- a/lib/Debian/Javahelper/Java.pm
+++ b/lib/Debian/Javahelper/Java.pm
@@ -112,6 +112,9 @@ sub scan_javadoc{
     my @packages = slurp_file("$docloc/package-list");
     # For each package in package-list (replacing "." with "/")
     foreach my $pack ( map { s@\.@/@go; $_; } @packages) {
+        if ("unnamed package" eq $pack) {
+            next;
+        }
         opendir(my $dir, "$docloc/$pack");
         # For each html file in $dir
         foreach my $file ( grep { m/\.html$/iox } readdir($dir)){

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git