From 8aef242c00102b4f62c6737832233aac093413f0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 8 Mar 2016 11:40:57 -0500 Subject: redirect stderr to /dev/null for preinst so unnecessary errors are not shown to people who have not previously installed the package --- debian/changelog | 2 ++ debian/preinst | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5bafe10..e8a28d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ leap-archive-keyring (2016.03.08) unstable; urgency=medium * preinst: use set -e instead of passing -e to the shell in #! * remove duplicate priority in binary package * rename keyrings to be 'archive' instead of 'keyring' + * redirect preinst stderr keyremovals to /dev/null to remove + unnecessary errors if you dont already have it installed [ Daniel Kahn Gillmor] * convert to debhelper diff --git a/debian/preinst b/debian/preinst index 7f25ba3..c88a2f1 100755 --- a/debian/preinst +++ b/debian/preinst @@ -15,8 +15,8 @@ set -e if [ -e /etc/apt/trusted.gpg ] && which gpg >/dev/null; then # remove the version of the keys that were shipped in leap-keyring before version 2016.03.03: - gpg --batch --no-tty --no-default-keyring --keyring /etc/apt/trusted.gpg --delete-key 0x1E453B2CE87BEE2F7DFE99661E34A1828E207901 || true - gpg --batch --no-tty --no-default-keyring --keyring /etc/apt/trusted.gpg --delete-key 0xCE433F407BAB443AFEA196C1837C1AD5367429D9 || true + gpg --batch --no-tty --no-default-keyring --keyring /etc/apt/trusted.gpg --delete-key 0x1E453B2CE87BEE2F7DFE99661E34A1828E207901 2>/dev/null || true + gpg --batch --no-tty --no-default-keyring --keyring /etc/apt/trusted.gpg --delete-key 0xCE433F407BAB443AFEA196C1837C1AD5367429D9 2>/dev/null || true fi #DEBHELPER# -- cgit v1.2.3