testing/systemd-rpm-macros
SHA256
3
0
Fork 0
forked from pool/systemd-rpm-macros
Code Pull Requests Activity

- Remove a useless test in %service_add_pre()

Browse Source 
The test was placed where the condition '[ "$FIRST_ARG" -gt 1 ]' was
  always true.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=20
This commit is contained in:
Franck Bui 2017-11-02 16:12:23 +00:00 committed by Git OBS Bridge
parent 5e363286ea
commit d0cd081100
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
macros.systemd
View File

@ -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 \

8
systemd-rpm-macros.changes
View File

@ -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