[gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ca-certificates-20080809.ebuild

[Mike Frysinger (vapier)]

vapier      08/12/27 18:45:15

  Modified:             ca-certificates-20080809.ebuild
  Log:
  Run update-ca-certificates before searching for broken links #252618 by Toralf Förster.
  (Portage version: 2.2_rc18/cvs/Linux 2.6.28 x86_64)

Revision  Changes    Path
1.8                  app-misc/ca-certificates/ca-certificates-20080809.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/ca-certificates/ca-certificates-20080809.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/ca-certificates/ca-certificates-20080809.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/ca-certificates/ca-certificates-20080809.ebuild?r1=1.7&r2=1.8

Index: ca-certificates-20080809.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20080809.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ca-certificates-20080809.ebuild	27 Dec 2008 13:49:24 -0000	1.7
+++ ca-certificates-20080809.ebuild	27 Dec 2008 18:45:14 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20080809.ebuild,v 1.7 2008/12/27 13:49:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20080809.ebuild,v 1.8 2008/12/27 18:45:14 vapier Exp $
 
 inherit eutils
 
@@ -53,6 +53,12 @@
 }
 
 pkg_postinst() {
+	if [[ ${ROOT} == "/" ]] ; then
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		update-ca-certificates
+	fi
+
 	local badcerts=0
 	for c in $(find -L "${ROOT}"etc/ssl/certs/ -type l) ; do
 		ewarn "Broken symlink for a certificate at $c"
@@ -64,9 +70,4 @@
 		ewarn "To batch-remove them, run:"
 		ewarn "find -L ${ROOT}etc/ssl/certs/ -type l -exec rm {} +"
 	fi
-
-	[[ ${ROOT} != "/" ]] && return 0
-	# However it's too overzealous when the user has custom certs in place.
-	# --fresh is to clean up dangling symlinks
-	update-ca-certificates
 }