[ca-certificates-java] 06/46: bugfixes

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository ca-certificates-java.

commit 78f0e3f3737da84b425ba78f90df135adc410334
Author: Torsten Werner <twerner at debian.org>
Date:   Mon Apr 25 10:18:31 2011 +0000

    bugfixes
---
 debian/jks-keystore.hook |  4 ----
 debian/postinst          | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/debian/jks-keystore.hook b/debian/jks-keystore.hook
index a23ee1d..1245bd9 100644
--- a/debian/jks-keystore.hook
+++ b/debian/jks-keystore.hook
@@ -42,8 +42,4 @@ java UpdateCertificates -storepass "$storepass"
 
 [ -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."
diff --git a/debian/postinst b/debian/postinst
index 1290961..7021fed 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -34,13 +34,7 @@ first_install()
         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 @@ case "$1" in
 		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

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