Author: wiget Date: Sun Dec 4 19:32:12 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- NORESTART in systemd_post
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.626 -> 1.627)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.626
packages/rpm-build-macros/rpm.macros:1.627
--- packages/rpm-build-macros/rpm.macros:1.626 Sun Dec 4 18:22:56 2011
+++ packages/rpm-build-macros/rpm.macros Sun Dec 4 20:32:06 2011
@@ -2063,7 +2063,7 @@
# %systemd_reload
#
# Requirements:
-# BuildRequires: rpmbuild(macros) >= 1.626
+# BuildRequires: rpmbuild(macros) >= 1.627
# Requires: systemd-units >= 37-0.10
%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning
SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
@@ -2074,7 +2074,7 @@
if [ $1 -eq 1 ]; then \
/bin/systemctl --quiet enable %{*} || : \
fi \
- if [ $1 -gt 1 ]; then \
+ if [ $1 -gt 1 ] && [ -z "$NORESTART" ]; then \
/bin/systemctl --quiet try-restart %{*} || : \
fi \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.626&r2=1.627&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
