[pkg-java] r19174 - trunk/ca-certificates-java/debian

[Benjamin Drung]

Author: bdrung
Date: 2016-11-07 12:35:38 +0000 (Mon, 07 Nov 2016)
New Revision: 19174

Modified:
   trunk/ca-certificates-java/debian/postinst.in
Log:
postinst: Use exit trap to not fail silently

first_install() is called inside an if condition and thus 'set -e' does
not cause the script to exit on failure. Replace the if condition by an
exit trap to not ignore failures (e.g. when the jvm is not found).

Closes: #822201


Modified: trunk/ca-certificates-java/debian/postinst.in
===================================================================
--- trunk/ca-certificates-java/debian/postinst.in	2016-11-07 12:29:38 UTC (rev 19173)
+++ trunk/ca-certificates-java/debian/postinst.in	2016-11-07 12:35:38 UTC (rev 19174)
@@ -103,12 +103,8 @@
                 printf -- "-server KNOWN\n" > $temp_jvm_cfg
             fi
 
-            if first_install; then
-                do_cleanup
-            else
-                do_cleanup
-                exit 1
-            fi
+            trap do_cleanup EXIT
+            first_install
         fi
         chmod 600 /etc/default/cacerts || true
     ;;