[packages/rpm-build-macros] upstart_post: do nothing if not under upstart supervision

[glen]

commit dc4639bc862930b734a759f682564561e2000f15
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 2 12:11:14 2014 +0200

    upstart_post: do nothing if not under upstart supervision

 rpm-build-macros.spec | 2 +-
 rpm.macros            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index c2e37ae..33c7231 100644
--- 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 d892bbb..f4f58a9 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -2260,6 +2260,7 @@ fi; \
 # pre/post script for -upstart subpackages
 #
 # Author: Jacek Konieczny <jajcus at jajcus.net>
+# Author: Elan Ruusamäe <glen at 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 \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/dc4639bc862930b734a759f682564561e2000f15