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

[Torsten Werner]

Author: twerner
Date: 2011-04-25 10:18:31 +0000 (Mon, 25 Apr 2011)
New Revision: 13573

Modified:
   trunk/ca-certificates-java/debian/jks-keystore.hook
   trunk/ca-certificates-java/debian/postinst
Log:
bugfixes


Modified: trunk/ca-certificates-java/debian/jks-keystore.hook
===================================================================
--- trunk/ca-certificates-java/debian/jks-keystore.hook	2011-04-25 10:13:10 UTC (rev 13572)
+++ trunk/ca-certificates-java/debian/jks-keystore.hook	2011-04-25 10:18:31 UTC (rev 13573)
@@ -42,8 +42,4 @@
 
 [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg
 
-if [ $errors -gt 0 ]; then
-    echo >&2 "failed (VM used: $jvm)."
-    exit 1
-fi
 echo "done."

Modified: trunk/ca-certificates-java/debian/postinst
===================================================================
--- trunk/ca-certificates-java/debian/postinst	2011-04-25 10:13:10 UTC (rev 13572)
+++ trunk/ca-certificates-java/debian/postinst	2011-04-25 10:18:31 UTC (rev 13573)
@@ -34,13 +34,7 @@
         echo "+${filename}"
     done | \
     java UpdateCertificates -storepass "$storepass"
-    if [ $errors -gt 0 ]; then
-	echo >&2 "failed (VM used: $jvm)."
-	[ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg
-	exit 1
-    fi
     echo "done."
-    )
 }
 
 case "$1" in
@@ -65,10 +59,6 @@
 		printf -- "-server KNOWN\n" > $temp_jvm_cfg
 	    fi
 
-	    # on first install, remove certs untrusted by the
-	    # user/admininstrator, add locally added certs
-	    echo "creating $KEYSTORE..."
-	    cp /usr/share/ca-certificates-java/cacerts $KEYSTORE
 	    first_install
 
 	    [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg