Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2012-07-30 20:40:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2012-07-25
10:44:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2012-07-30
20:41:00.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 30 11:37:17 UTC 2012 - fcro...@suse.com
+
+- Ensure systemd macros never fails (if systemd isn't install)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
systemd.spec: same change
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.6unOIh/_old 2012-07-30 20:41:05.000000000 +0200
+++ /var/tmp/diff_new_pack.6unOIh/_new 2012-07-30 20:41:05.000000000 +0200
@@ -32,10 +32,11 @@
%service_add_pre()
\
test -n "$FIRST_ARG" || FIRST_ARG=$1
\
# disable migration if initial install under systemd
\
+[ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
if [ $FIRST_ARG -eq 1 ]; then
\
for service in %{?*} ; do
\
sysv_service=${service%.*}
\
- touch "/var/lib/systemd/migrated/$sysv_service"
\
+ touch "/var/lib/systemd/migrated/$sysv_service" || :
\
done
\
else
\
for service in %{?*} ; do
\
@@ -53,11 +54,12 @@
# On install, tell systemd to reload its unit files
%service_add_post()
\
test -n "$FIRST_ARG" || FIRST_ARG=$1
\
+[ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
for service in %{?*} ; do
\
sysv_service=${service%.*}
\
if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then
\
services_to_migrate="$services_to_migrate $sysv_service"
\
- touch "/var/lib/systemd/migrated/$sysv_service"
\
+ touch "/var/lib/systemd/migrated/$sysv_service" || :
\
fi
\
done
\
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
\
@@ -87,7 +89,7 @@
else # package uninstall
\
for service in %{?*} ; do
\
sysv_service=${service%.*}
\
- rm -f "/var/lib/systemd/migrated/$sysv_service" 2> /dev/null
\
+ rm -f "/var/lib/systemd/migrated/$sysv_service" 2> /dev/null || :
\
done
\
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
\
fi
\
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
