[Git][java-team/javatools][master] jh_manifest: Fix the error when the jar processed doesn't have a manifest (Closes: #952370)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / javatools


Commits:
73afb66e by Emmanuel Bourg at 2020-07-05T11:50:07+02:00
jh_manifest: Fix the error when the jar processed doesn't have a manifest (Closes: #952370)

- - - - -


2 changed files:

- debian/changelog
- jh_manifest


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
-javatools (0.73) unstable; urgency=medium
+javatools (0.74) unstable; urgency=medium
 
-  * New dependency on bsdextrautils (Closes: #963195)
   * jh_manifest: Fix the error when the jar processed doesn't have a manifest
     (Closes: #952370)
 
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 05 Jul 2020 11:49:48 +0200
+
+javatools (0.73) unstable; urgency=medium
+
+  * New dependency on bsdextrautils (Closes: #963195)
+
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 22 Jun 2020 14:16:14 +0200
 
 javatools (0.72.12) unstable; urgency=medium


=====================================
jh_manifest
=====================================
@@ -294,10 +294,9 @@ sub update_jar{
     my $new_manifest = 0;
     # stringify or $zip will make a call back that fails.
     $zip->read( "$jar" ) == AZ_OK or error("Could not read $jar: $!");
-    ($con, $stat) = $zip->contents( 'META-INF/MANIFEST.MF' );
-    die("Could not read manifest from $jar ($stat): $!")
-        unless(!defined($stat) || $stat == AZ_OK);
-    if(defined($stat)) {
+
+    if(defined($zip->memberNamed( 'META-INF/MANIFEST.MF' ))) {
+        ($con, $stat) = $zip->contents( 'META-INF/MANIFEST.MF' );
         verbose_print("Reading manifest from $jar");
         open(my $fd, '<', \$con);
         $manifest = parse_manifest_fd($fd, $jar);



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

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/-/commit/73afb66e2f9ff2b07c32d7518367b0998285bc06
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/20200705/753aa4a8/attachment.html>