summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-08-02 11:50:19 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-08-02 11:50:19 +0200
commit82cb2b8140fbe21a7000fcf2f3641f18fd0c0d27 (patch)
tree79cb166ac601441f3559e1d1a30eb76237fc700f
parent095aa04a3dc4b9a57f904c8bfbb5980aae11f53b (diff)
* debian/apt.postinst:
- do not fail if ubuntu-keyring is not installed
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog7
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst
index 34545468e..2ebcfb19b 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -18,7 +18,7 @@ case "$1" in
if ! test -f /etc/apt/trusted.gpg; then
cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
fi
- apt-key update
+ apt-key update || true
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/changelog b/debian/changelog
index d4d4ece09..9434dfd8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.26~exp12ubuntu2) maverick; urgency=low
+
+ * debian/apt.postinst:
+ - do not fail if ubuntu-keyring is not installed
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 11:47:59 +0200
+
apt (0.7.26~exp12ubuntu1) maverick; urgency=low
* ABI break upload