diff options
| author | Christian PERRIER <bubulle@debian.org> | 2013-08-17 07:58:13 +0200 |
|---|---|---|
| committer | Christian PERRIER <bubulle@debian.org> | 2013-08-17 07:58:13 +0200 |
| commit | 010364b7b52af9f6f4d8cbb6391a721260b6ffb5 (patch) | |
| tree | 3ea2ba749956270d53f4705a1358af01b3b060fe /debian/apt.postinst | |
| parent | 34b769c51ac7cf747fb9dc5b8a5697c1c292360b (diff) | |
| parent | 488011fa99aee25bedb39ae2cc3115ad1ab000c0 (diff) | |
Merge branch 'debian/sid' of git://git.debian.org/git/apt/apt into debian/sid
Diffstat (limited to 'debian/apt.postinst')
| -rw-r--r-- | debian/apt.postinst | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst index 9ff1e031c..70de237d0 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,12 +15,16 @@ 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 + if dpkg --compare-versions "$2" lt-nl 0.9.9.5; then + # we are using tmpfiles for both + rm -f /etc/apt/trustdb.gpg + # this removal was done unconditional since 0.8.15.3 + 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 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 |