summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <egon@tas>2008-10-31 21:03:19 +0100
committerMichael Vogt <egon@tas>2008-10-31 21:03:19 +0100
commite9120a9931b6914bb7d169dc1e068edf60b03efb (patch)
treed9ef8b4a168726b75385207131082fdaa818f854 /cmdline
parent708ead3a44ac2f5ea625343c5d1b3404cca8a481 (diff)
parentdac074b0ad8925ea542edea8ffd113736364344e (diff)
* debian/rules:
- Fixed lintian warnings "debian/rules ignores make errors". * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". - Added 'python-apt' to Suggests, as apt-mark need it for work. - Drop Debian revision from 'doc-base' build dependency, this fixes appropriate lintian warning. * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. * debian/{postrm,prerm,preinst}: - Added 'set -e', fixes lintian warnings 'maintainer-script-ignores-error'. * dselect/makefile: - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. * share/lintian-overrides: - Added with override of 'apt must depend on python'. Script 'apt-mark' needs apt-python for working and checks this on fly. We don't want python in most cases. * cmdline/apt-key: - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' failure when GREP_OPTIONS contains options that modify grep output. (Closes: #428752)
Diffstat (limited to 'cmdline')
-rwxr-xr-xcmdline/apt-key1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 51a0bc2d1..7bb30240e 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -1,6 +1,7 @@
#!/bin/sh
set -e
+unset GREP_OPTIONS
# We don't use a secret keyring, of course, but gpg panics and
# implodes if there isn't one available