Attachment 44941 Details for Bug 35750 – strip out code to compare by Exec=

[patch] strip out code to compare by Exec=

0001-activation-Strip-out-code-to-compare-by-Exec.patch (text/plain), 2.85 KB, created by Colin Walters on 2011-03-28 10:34:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2011-03-28 10:34:59 UTC

Size: 2.85 KB

patch

obsolete

>From 1f692e8c1f9d686ffe888f1fc2982c239dec405d Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Mon, 28 Mar 2011 13:21:35 -0400
>Subject: [PATCH] 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.
>---
> bus/activation.c |   22 ++++------------------
> 1 files changed, 4 insertions(+), 18 deletions(-)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index ee5efa8..8919409 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -1670,11 +1670,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 >=
>@@ -1753,7 +1751,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))
>         {
>@@ -1860,19 +1859,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))
>@@ -1895,7 +1881,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))
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 35750: 44941

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.