[Amavisd-new-commits] [pkg-amavisd-new] 12/21: Surpress warning in amavisd-snmp-subagent if postfix isn't installed

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-amavisd-new.

commit 775770697714c5166bc64dcb66e0dd371a49729f
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Sep 15 11:24:57 2013 +0200

    Surpress warning in amavisd-snmp-subagent if postfix isn't installed
---
 debian/patches/90_fix_snmp_subagent_warning |   11 +++++++++++
 debian/patches/series                       |    1 +
 2 files changed, 12 insertions(+)

diff --git a/debian/patches/90_fix_snmp_subagent_warning b/debian/patches/90_fix_snmp_subagent_warning
new file mode 100644
index 0000000..628a947
--- /dev/null
+++ b/debian/patches/90_fix_snmp_subagent_warning
@@ -0,0 +1,11 @@
+--- a/amavisd-snmp-subagent
++++ b/amavisd-snmp-subagent
+@@ -777,7 +777,7 @@
+   if (!defined $mta_queue_dir) {  # test for access to Postfix queue directory
+     local($ENV{PATH}) = '/usr/sbin:/usr/local/sbin:/opt/postfix/sbin';
+     $! = 0;
+-    $mta_queue_dir = qx(postconf -h queue_directory);
++    $mta_queue_dir = qx(postconf -h queue_directory 2>/dev/null);
+     if (!defined $mta_queue_dir) {
+       if ($! != 0) {
+         do_log(1, "no postfix (unable to run postconf command): $!");
diff --git a/debian/patches/series b/debian/patches/series
index 1ff30be..460ab60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 45_misc_doc_changes.patch
 60-amavisd-snmp-subagent_paths.patch
 85-clarify_fqdn_error.patch
+90_fix_snmp_subagent_warning

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/amavisd-new/pkg-amavisd-new.git