diff --git a/macros.systemd b/macros.systemd index 6a6ad36..df7f472 100644 --- a/macros.systemd +++ b/macros.systemd @@ -77,13 +77,11 @@ if [ "$FIRST_ARG" -eq 1 ]; then \ touch "/var/lib/systemd/migrated/$sysv_service" || : \ done \ else \ - if [ "$FIRST_ARG" -gt 1 ]; then \ - for service in %{?*} ; do \ - if [ ! -e "/usr/lib/systemd/system/$service" ]; then \ - touch "/run/rpm-%{name}-update-$service-new-in-upgrade" \ - fi \ - done \ - fi \ + for service in %{?*} ; do \ + if [ ! -e "/usr/lib/systemd/system/$service" ]; then \ + touch "/run/rpm-%{name}-update-$service-new-in-upgrade" \ + fi \ + done \ for service in %{?*} ; do \ sysv_service="${service%%.*}" \ if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then \ @@ -107,7 +105,7 @@ for service in %{?*} ; do \ touch "/var/lib/systemd/migrated/$sysv_service" || : \ fi \ done \ -if [ "$YAST_IS_RUNNING" != "instsys" -a -x /usr/bin/systemctl ]; then \ +if [ "$YAST_IS_RUNNING" != "instsys" -a -x /usr/bin/systemctl ]; then \ /usr/bin/systemctl daemon-reload || : \ fi \ if [ -n "$services_to_migrate" ]; then \ diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 0b4fa80..3395e2c 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 2 16:09:29 UTC 2017 - fbui@suse.com + +- Remove a useless test in %service_add_pre() + + The test was placed where the condition '[ "$FIRST_ARG" -gt 1 ]' was + always true. + ------------------------------------------------------------------- Fri Jun 2 09:59:37 UTC 2017 - dimstar@opensuse.org