merged from debian-experimental2

[apt.git] / debian / apt.postinst

diff --git a/debian/apt.postinst b/debian/apt.postinst
index 88fb932dfed5628494fd8efdb2b8b945755b12ff..4d87c4e256f8ab3ee936a6037a6f0b748ef53580 100644 (file)
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,13 +15,12 @@ set -e
 
 case "$1" in
     configure)
 
 case "$1" in
     configure)

-
-        if ! test -f /etc/apt/trusted.gpg; then
-                cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
-        fi
-
+       SECRING='/etc/apt/secring.gpg'
+       # test if secring is an empty normal file
+       if test -f $SECRING -a ! -s $SECRING; then
+               rm -f $SECRING
+       fi

        apt-key update
        apt-key update

-

     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)