[dovecot] do not print error when NetworkManager is not installed (#916456)

Michal Hlavinka mhlavink at fedoraproject.org
Thu Feb 28 08:47:36 UTC 2013


commit bb6a8ab18e26a8b74d276ed7f504b9f51a0a40c8
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Feb 28 09:47:32 2013 +0100

    do not print error when NetworkManager is not installed (#916456)

 dovecot.spec   |    5 ++++-
 prestartscript |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/dovecot.spec b/dovecot.spec
index 13977c0..c43a521 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -3,7 +3,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.2
 %global prever .rc2
-Release: 0%{?dist}.1
+Release: 0%{?dist}.2
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -479,6 +479,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Thu Feb 28 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.2-0.2
+- do not print error when NetworkManager is not installed (#916456)
+
 * Wed Feb 27 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.2-0.1
 - major update to dovecot 2.2 RC2
 
diff --git a/prestartscript b/prestartscript
index e4824e0..0c5492c 100644
--- a/prestartscript
+++ b/prestartscript
@@ -1,3 +1,3 @@
 #!/bin/sh
-/bin/systemctl -q is-enabled NetworkManager.service && /usr/bin/nm-online -q --timeout 30 ||:
+/bin/systemctl -q is-enabled NetworkManager.service >/dev/null 2>&1 && /usr/bin/nm-online -q --timeout 30 ||:
 


More information about the scm-commits mailing list