|
 |
2d15635 |
From fd764e8bee33e7a65647a8c77a360da741407afc Mon Sep 17 00:00:00 2001
|
|
|
2d15635 |
From: Dave Reisner <dreisner@archlinux.org>
|
|
|
2d15635 |
Date: Tue, 14 Oct 2014 07:54:56 -0400
|
|
|
2d15635 |
Subject: [PATCH] python-systemd: avoid hitting assert in __exit__
|
|
|
2d15635 |
|
|
|
2d15635 |
Reader_close() asserts that 'args' is always NULL, but the __exit__
|
|
|
2d15635 |
function forwards a non-NULL args.
|
|
|
2d15635 |
|
|
|
2d15635 |
(cherry picked from commit 9ff5ff320ec71fec7f2c841223380665794afd07)
|
|
|
2d15635 |
|
|
|
2d15635 |
Conflicts:
|
|
|
2d15635 |
src/python-systemd/_reader.c
|
|
|
2d15635 |
---
|
|
|
2d15635 |
src/python-systemd/_reader.c | 5 ++---
|
|
|
2d15635 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
2d15635 |
|
|
|
2d15635 |
diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
|
|
|
2d15635 |
index 0c889263a4..d1e05a4e48 100644
|
|
|
2d15635 |
--- a/src/python-systemd/_reader.c
|
|
|
2d15635 |
+++ b/src/python-systemd/_reader.c
|
|
|
2d15635 |
@@ -325,9 +325,8 @@ PyDoc_STRVAR(Reader___exit____doc__,
|
|
|
2d15635 |
"__exit__(type, value, traceback) -> None\n\n"
|
|
|
2d15635 |
"Part of the context manager protocol.\n"
|
|
|
2d15635 |
"Closes the journal.\n");
|
|
|
2d15635 |
-static PyObject* Reader___exit__(Reader *self, PyObject *args)
|
|
|
2d15635 |
-{
|
|
|
2d15635 |
- return Reader_close(self, args);
|
|
|
2d15635 |
+static PyObject* Reader___exit__(Reader *self, PyObject *args) {
|
|
|
2d15635 |
+ return Reader_close(self, NULL);
|
|
|
2d15635 |
}
|
|
|
2d15635 |
|
|
|
2d15635 |
|