merged from the debian-sid branch

[apt.git] / debian / apt.postinst

diff --git a/debian/apt.postinst b/debian/apt.postinst
index 88fb932dfed5628494fd8efdb2b8b945755b12ff..bd814e1afd2794176a0c9201ec6435e93edbcbcd 100644 (file)
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,13 +15,19 @@ set -e
 
 case "$1" in
     configure)
+       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
 
-        if ! test -f /etc/apt/trusted.gpg; then
-                cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+        # ensure tighter permissons on the logs, see LP: #975199
+        if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then
+            # ensure permissions are right
+            chmod -f 0640 /var/log/apt/term.log* || true
         fi
 
-       apt-key update
-
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)