From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 24 Jan 2014 14:45:09 +0000 (+0100)
Subject: remove empty keyrings in trusted.gpg.d on upgrade
X-Git-Tag: 1.1.exp4~34^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1d240b5a2dd5a82283f7d0b7fe05b6f90222957c?ds=inline;hp=--cc

remove empty keyrings in trusted.gpg.d on upgrade

Adding and deleting many repositories could cause (empty) keyring files
to pill up in older apt-key versions, which in the end might cause gnupg
to run into its internal limit of at most 40 keyrings
---

1d240b5a2dd5a82283f7d0b7fe05b6f90222957c
diff --git a/debian/apt.postinst b/debian/apt.postinst
index a538abde9..01f78a1dd 100755
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,6 +15,15 @@ set -e
 
 case "$1" in
     configure)
+	if dpkg --compare-versions "$2" lt 1.0.7; then
+	    # apt-key before 0.9.10 could leave empty keyrings around
+	    find /etc/apt/trusted.gpg.d/ -name '*.gpg' | while read keyring; do
+		if ! test -s "$keyring"; then
+		    rm -f "$keyring"
+		fi
+	    done
+	fi
+
 	if dpkg --compare-versions "$2" lt-nl 0.9.9.5; then
 	    # we are using tmpfiles for both
 	    rm -f /etc/apt/trustdb.gpg