Attachment 81941 Details for Bug 66542 – [PATCH] Fix "LEGACY" conditional directive

[PATCH] Fix "LEGACY" conditional directive

0001-Fix-LEGACY-conditional-directive.patch (text/plain), 2.18 KB, created by David Coppa on 2013-07-03 07:46:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Coppa

Created: 2013-07-03 07:46:13 UTC

Size: 2.18 KB

patch

obsolete

>From 01eae3a99b0be352c1d183e8e3d92c2043965496 Mon Sep 17 00:00:00 2001
>From: David Coppa <dcoppa@gmail.com>
>Date: Wed, 3 Jul 2013 09:38:35 +0200
>Subject: [PATCH] Fix "LEGACY" conditional directive
>
>---
> src/cgroups-agent/cgroups-agent.c | 4 ++--
> src/systemctl/systemctl.c         | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
>index 7a6173e..49a5e9b 100644
>--- a/src/cgroups-agent/cgroups-agent.c
>+++ b/src/cgroups-agent/cgroups-agent.c
>@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
>          * are called when the dbus service is shut down. */
> 
>         if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) {
>-#ifndef LEGACY
>+#ifdef LEGACY
>                 dbus_error_free(&error);
> 
>                 /* Retry with the pre v21 socket name, to ease upgrades */
>@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
>                         log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
>                         goto finish;
>                 }
>-#ifndef LEGACY
>+#ifdef LEGACY
>         }
> #endif
> 
>diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
>index 7436d4e..7d50a19 100644
>--- a/src/systemctl/systemctl.c
>+++ b/src/systemctl/systemctl.c
>@@ -1565,7 +1565,7 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
> 
>                         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>                 }
>-#ifndef LEGACY
>+#ifdef LEGACY
>                 dbus_error_free(&error);
>                 if (dbus_message_get_args(message, &error,
>                                           DBUS_TYPE_UINT32, &id,
>@@ -2916,7 +2916,7 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn
>                                 i->fragment_path = s;
>                         else if (streq(name, "SourcePath"))
>                                 i->source_path = s;
>-#ifndef LEGACY
>+#ifdef LEGACY
>                         else if (streq(name, "DefaultControlGroup")) {
>                                 const char *e;
>                                 e = startswith(s, SYSTEMD_CGROUP_CONTROLLER ":");
>-- 
>1.8.3.2
>

Actions: View

Attachments on bug 66542: 81941

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.