merged from the debian-sid branch

[apt.git] / debian / apt.postinst

diff --git a/debian/apt.postinst b/debian/apt.postinst
index df0433057f1dba4c0c87737214f2ab75a570c9ac..bd814e1afd2794176a0c9201ec6435e93edbcbcd 100644 (file)
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,9 +15,17 @@ set -e
 
 case "$1" in
     configure)
 
 case "$1" in
     configure)

-
-        if ! test -f /etc/apt/trusted.gpg; then
-                cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
+       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
+
+        # 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
 
     ;;
         fi
 
     ;;