From 136b8b8c86ac3499a5a7385081a9d0b21fc181f9 Mon Sep 17 00:00:00 2001 From: Sven Herzberg Date: Thu, 7 Apr 2011 18:25:34 +0100 Subject: list which parts of the Desktop Entry spec apply to service files Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19159 --- doc/dbus-specification.xml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index ee5aac58..54d3c462 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -39,6 +39,16 @@ + + Sven + Herzberg + + Imendio AB +
+ sven@imendio.com +
+ + @@ -3781,9 +3791,7 @@ . - [FIXME the file format should be much better specified than "similar to - .desktop entries" esp. since desktop entries are already - badly-specified. ;-)] Service description files have the ".service" file + Service description files have the ".service" file extension. The message bus will only load service description files ending with .service; all other files will be ignored. The file format is similar to that of + [FIXME the file format should be much better specified than "similar to + .desktop entries" esp. since desktop entries are already + badly-specified. ;-)] + These sections from the specification apply to service files as well: + + + General syntax + Comment format + +
Example service description file -- cgit v1.2.1 From aa009ba18b3520819835aab6d56861e6f73eb816 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 7 Apr 2011 18:27:52 +0100 Subject: oops, fix XML mis-nesting --- doc/dbus-specification.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index 54d3c462..836b64b7 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -3800,6 +3800,7 @@ encoding. To ensure that there will be no name collisions, service files must be namespaced using the same mechanism as messages and service names. + [FIXME the file format should be much better specified than "similar to -- cgit v1.2.1 From 171934b377a5e205c902c0645e6b8e802014232c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 28 Mar 2011 13:21:35 -0400 Subject: activation: Strip out code to compare by Exec= In commit: 075945f6 (John (J5) Palmieri 2005-07-14 20:44:15 +0000 some code was added to compare services by Exec key. The changelog is not pariticularly informative as to why this was added. But while debugging other code, we noticed this. Comparing by Exec key is not in the specification, and triggered a problem where while converting services to use systemd for activation, a change was made to use Exec=/bin/false and simply rely on systemd to activate. While I think it was broken for the service files to be changed to Exec=/bin/false, we shouldn't be doing something here that's not in the spec either. Reviewed-by: Will Thompson Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35750 --- bus/activation.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/bus/activation.c b/bus/activation.c index 7b2a72bc..ab6ef51e 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -1685,11 +1685,9 @@ bus_activation_activate_service (BusActivation *activation, int argc; dbus_bool_t retval; DBusHashIter iter; - dbus_bool_t activated; + dbus_bool_t was_pending_activation; DBusString command; - activated = TRUE; - _DBUS_ASSERT_ERROR_IS_CLEAR (error); if (activation->n_pending_activations >= @@ -1768,7 +1766,8 @@ bus_activation_activate_service (BusActivation *activation, /* Check if the service is being activated */ pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations, service_name); - if (pending_activation) + was_pending_activation = (pending_activation != NULL); + if (was_pending_activation) { if (!_dbus_list_append (&pending_activation->entries, pending_activation_entry)) { @@ -1875,19 +1874,6 @@ bus_activation_activate_service (BusActivation *activation, pending_activation->n_entries += 1; pending_activation->activation->n_pending_activations += 1; - activated = FALSE; - _dbus_hash_iter_init (activation->pending_activations, &iter); - while (_dbus_hash_iter_next (&iter)) - { - BusPendingActivation *p = _dbus_hash_iter_get_value (&iter); - - if (strcmp (p->exec, entry->exec) == 0) - { - activated = TRUE; - break; - } - } - if (!_dbus_hash_table_insert_string (activation->pending_activations, pending_activation->service_name, pending_activation)) @@ -1910,7 +1896,7 @@ bus_activation_activate_service (BusActivation *activation, return FALSE; } - if (activated) + if (was_pending_activation) return TRUE; if (bus_context_get_systemd_activation (activation->context)) -- cgit v1.2.1 From c34b6747eb0ef0e6fd2d17ec8dd9cb16f3d3b67e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 8 Apr 2011 14:30:23 +0100 Subject: Prepare version 1.4.8 --- NEWS | 12 +++++++++++- configure.ac | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 2532e315..3a545d5f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ -D-Bus 1.4.8 (UNRELEASED) +D-Bus 1.4.8 (2011-04-08) == +The "It's like the beginning of a lobster" release. + • Rename configure.in to configure.ac, and update it to modern conventions (fd.o #32245; Javier Jardón, Simon McVittie) • Correctly give XDG_DATA_HOME priority over XDG_DATA_DIRS (fd.o #34496, @@ -14,6 +16,12 @@ D-Bus 1.4.8 (UNRELEASED) booleans when sending them (fd.o #16338, NB#223152; Simon McVittie) • Add UnknownObject, UnknownInterface, UnknownProperty and PropertyReadOnly errors to dbus-shared.h (fd.o #34527, Lennart Poettering) + • Break up a huge conditional in config-parser so gcov can produce coverage + data (fd.o #10887, Simon McVittie) + • List which parts of the Desktop Entry specification are applicable to + .service files (fd.o #19159, Sven Herzberg) + • Don't suppress service activation if two services have the same Exec= + (fd.o #35750, Colin Walters) • Windows: · Avoid the name ELEMENT_TYPE due to namespace-pollution from winioctl.h (Andre Heinecke) @@ -23,6 +31,8 @@ D-Bus 1.4.8 (UNRELEASED) D-Bus 1.4.6 (2010-02-17) == +The "1, 2, miss a few, 99, 100" release. + • Remove unfinished changes intended to support GTest-based tests, which were mistakenly included in 1.4.4 diff --git a/configure.ac b/configure.ac index 03914e17..f2e02a16 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) m4_define([dbus_major_version], [1]) m4_define([dbus_minor_version], [4]) -m4_define([dbus_micro_version], [7]) +m4_define([dbus_micro_version], [8]) m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus]) @@ -36,7 +36,7 @@ LT_CURRENT=8 ## increment any time the source changes; set to ## 0 if you increment CURRENT -LT_REVISION=4 +LT_REVISION=5 ## increment if any interfaces have been added; set to 0 ## if any interfaces have been changed or removed. removal has -- cgit v1.2.1 From 4a0e7d29a491a865d02063e6879bf8d779e1452a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 8 Apr 2011 15:22:31 +0100 Subject: development version --- NEWS | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3a545d5f..6451a762 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +D-Bus 1.4.10 (UNRELEASED) +== + +... + D-Bus 1.4.8 (2011-04-08) == diff --git a/configure.ac b/configure.ac index f2e02a16..075b5832 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) m4_define([dbus_major_version], [1]) m4_define([dbus_minor_version], [4]) -m4_define([dbus_micro_version], [8]) +m4_define([dbus_micro_version], [9]) m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus]) -- cgit v1.2.1