diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-16 14:21:51 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-16 14:21:51 +0200 |
| commit | 285feb3cedca3cccff971155099adef8d902223d (patch) | |
| tree | 87c97ee27b2586a7e82b5c0f938d687df5fa67a9 /debian | |
| parent | 0df8c3dccbda739af6e20999fb208ada0619ad80 (diff) | |
* cmdline/apt-key:
- use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596)
* debian/apt.postinst:
- remove /etc/apt/secring.gpg if it is an empty file
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.postinst | 5 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst index cc0d8b1fe..4d87c4e25 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,6 +15,11 @@ 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 ;; diff --git a/debian/changelog b/debian/changelog index 2e22e64d8..914c53801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,12 @@ apt (0.8.15.3) UNRELEASED; urgency=low - use CndSet in pkgInitConfig (Closes: #629617) * apt-pkg/depcache.cc: - change default of APT::AutoRemove::SuggestsImportant to true + * cmdline/apt-key: + - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596) + * debian/apt.postinst: + - remove /etc/apt/secring.gpg if it is an empty file - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 15 Jul 2011 09:29:37 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 16 Jul 2011 14:19:51 +0200 apt (0.8.15.2) unstable; urgency=high |