Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at 2012-11-15 10:57:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/insserv (Old) and /work/SRC/openSUSE:Factory/.insserv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "insserv", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/insserv/insserv.changes 2012-11-14 16:40:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.insserv.new/insserv.changes 2012-11-15 10:57:29.000000000 +0100 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Thu Nov 15 09:27:30 UTC 2012 - [email protected] + +- Bug fix: do not close dbus connection which was never established +- Avoid warning about not existing systemd socket + +------------------------------------------------------------------- New: ---- insserv-1.16.0.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.poL0cs/_old 2012-11-15 10:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.poL0cs/_new 2012-11-15 10:57:31.000000000 +0100 @@ -28,7 +28,7 @@ Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.bz2 Source1: insserv.conf -#Patch: insserv-%{version}.dif +Patch: insserv-%{version}.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _sbindir /sbin @@ -46,7 +46,7 @@ %prep %setup -#%patch +%patch %build # remove -DOSCBUILD if all packages are fixed ++++++ insserv-1.16.0.dif ++++++ --- insserv.c +++ insserv.c 2012-11-15 08:54:32.110344983 +0000 @@ -2942,33 +2942,11 @@ int main (int argc, char *argv[]) if (systemd) import_systemd_facilities(); - { - list_t *ptr; - list_for_each(ptr, sysfaci_start) { - list_t *iptr, *head = &getfaci(ptr)->replace; - printf("%s : ", getfaci(ptr)->name); - np_list_for_each(iptr, head) - printf("%s ", getrepl(iptr)->name); - printf("\n"); - } - } - /* * Expand system facilities to real services */ expand_conf(); - { - list_t *ptr; - list_for_each(ptr, sysfaci_start) { - list_t *iptr, *head = &getfaci(ptr)->replace; - printf("%s : ", getfaci(ptr)->name); - np_list_for_each(iptr, head) - printf("%s ", getrepl(iptr)->name); - printf("\n"); - } - } - /* * Handle Systemd services (<name>.service -> <name>) */ --- systemd.c +++ systemd.c 2012-11-15 09:23:26.866345317 +0000 @@ -404,7 +404,8 @@ DBusConnection * systemd_open_conn(void) bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); if (!bus) { - warn ("can not connect systemd: %s\n", error.message); + if (errno != ENOENT) + warn ("can not connect systemd: %s\n", error.message); goto err; } dbus_connection_set_exit_on_disconnect(bus, FALSE); @@ -425,9 +426,9 @@ DBusConnection * systemd_open_conn(void) return bus; perm: warn ("can not connect to systemd: %m\n"); -err: dbus_connection_close(bus); dbus_connection_unref(bus); +err: if (dbus_error_is_set(&error)) dbus_error_free(&error); return (DBusConnection*)0; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
