upstart_post: do nothing if not under upstart supervision

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index c2e37ae9fb6670b322ee2b0fd891b6b4cda2e09a..33c72317bc672494dc26b7383f13924a52aada2e 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.689
+%define                rpm_macros_rev  1.690
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index d892bbba2976483b2e3d42878c25a645f54116f5..f4f58a99d02fc96b1705222a9ac4a1b8baec2f11 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -2260,6 +2260,7 @@ fi; \
 # pre/post script for -upstart subpackages
 #
 # Author: Jacek Konieczny <jajcus@jajcus.net>
+# Author: Elan Ruusamäe <glen@pld-linux.org>
 #
 # Usage:
 #      %upstart_post service_name
@@ -2273,12 +2274,12 @@ fi; \
 # %upstart_postun %{name}
 #
 # Requirements:
-# BuildRequires:       rpmbuild(macros) >= 1.689
+# BuildRequires:       rpmbuild(macros) >= 1.690
 # Requires:                    rc-scripts >= 0.4.3
 
 # migrate from init script to upstart job
 %upstart_post() \
-       if [ -f /var/lock/subsys/%1 ]; then \
+       if [ -x /sbin/initctl ] && [ -f /var/lock/subsys/%1 ]; then \
                /sbin/service --no-upstart %1 stop \
                /sbin/service %1 start \
        fi \