Skip to content
This repository
Browse code

Merge pull request #172 from justdave/issue171

amavis-milter: initscript status fix
  • Loading branch information...
commit 962a3cc0563ea40065fb8b60ebb49f2fe9a80855 2 parents 6ec6a5f + 554bd8d
Denis Fateyev authored May 22, 2012

Showing 1 changed file with 8 additions and 2 deletions. Show diff stats Hide diff stats

  1. 10  specs/amavisd-new/amavisd-new.spec
10  specs/amavisd-new/amavisd-new.spec
@@ -16,7 +16,7 @@
16 16
 Summary: Mail virus-scanner
17 17
 Name: amavisd-new
18 18
 Version: 2.6.6
19  
-Release: 2%{?dist}
  19
+Release: 3%{?dist}
20 20
 License: GPL
21 21
 Group: System Environment/Daemons
22 22
 URL: http://www.ijs.si/software/amavisd/
@@ -262,7 +262,9 @@ case "$1" in
262 262
     ;;
263 263
   status)
264 264
     status $prog
265  
-    status $prog2
  265
+    if [ "$MILTER_SOCKET" -a -x "%{_sbindir}/$prog2" ]; then
  266
+        status $prog2
  267
+    fi
266 268
     RETVAL=$?
267 269
     ;;
268 270
   *)
@@ -494,6 +496,10 @@ fi
494 496
 %{_sbindir}/amavisd-snmp-subagent
495 497
 
496 498
 %changelog
  499
+* Tue May 22 2012 Dave Miller <justdave@mozilla.com> - 2.6.6-3
  500
+- initscript status command shouldn't fail if amavis-milter isn't configured
  501
+  (issue 171)
  502
+
497 503
 * Sun Jan 15 2012 David Hrbáč <david@hrbac.cz> - 2.6.6-2
498 504
 - first attempt to fix EL6 build
499 505
 

0 notes on commit 962a3cc

Please sign in to comment.
Something went wrong with that request. Please try again.