SHA256
1
0
forked from pool/systemd
systemd/0004-systemd-python-use-.hex-instead-of-.get_hex.patch
Stephan Kulow d4886680e8 Accepting request 229352 from Base:System
- Add patch portmap-wants-rpcbind-socket.patch to make sure that
  rpcbind socket as well as service is up with the target
- Add or port upstram bugfix patches:
  0001-journal-fix-export-of-messages-containing-newlines.patch
  0002-systemctl-update-NAME-to-PATTERN-in-help.patch
  0003-tty-ask-password-agent-return-negative-errno.patch
  0004-systemd-python-use-.hex-instead-of-.get_hex.patch
  0005-systemd-python-fix-failing-assert.patch

- Add patch portmap-wants-rpcbind-socket.patch to make sure that
  rpcbind socket as well as service is up with the target
- Add or port upstram bugfix patches:
  0001-journal-fix-export-of-messages-containing-newlines.patch
  0002-systemctl-update-NAME-to-PATTERN-in-help.patch
  0003-tty-ask-password-agent-return-negative-errno.patch
  0004-systemd-python-use-.hex-instead-of-.get_hex.patch
  0005-systemd-python-fix-failing-assert.patch

OBS-URL: https://build.opensuse.org/request/show/229352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=180
2014-04-09 16:17:19 +00:00

47 lines
1.5 KiB
Diff

From b532cf3722e04adb0bd075666eb9989a9390d0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 5 Apr 2014 13:23:25 -0400
Subject: [PATCH] systemd-python: use .hex instead of .get_hex()
It turns out the latter got removed in Python 3.
https://bugs.freedesktop.org/show_bug.cgi?id=77086
---
src/python-systemd/journal.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git src/python-systemd/journal.py src/python-systemd/journal.py
index 9c7e004..dd1f229 100644
--- src/python-systemd/journal.py
+++ src/python-systemd/journal.py
@@ -293,7 +293,7 @@ class Reader(_Reader):
monotonic = monotonic.totalseconds()
monotonic = int(monotonic * 1000000)
if isinstance(bootid, _uuid.UUID):
- bootid = bootid.get_hex()
+ bootid = bootid.hex
return super(Reader, self).seek_monotonic(monotonic, bootid)
def log_level(self, level):
@@ -314,7 +314,7 @@ class Reader(_Reader):
Equivalent to add_match(MESSAGE_ID=`messageid`).
"""
if isinstance(messageid, _uuid.UUID):
- messageid = messageid.get_hex()
+ messageid = messageid.hex
self.add_match(MESSAGE_ID=messageid)
def this_boot(self, bootid=None):
@@ -346,7 +346,7 @@ class Reader(_Reader):
def get_catalog(mid):
if isinstance(mid, _uuid.UUID):
- mid = mid.get_hex()
+ mid = mid.hex
return _get_catalog(mid)
def _make_line(field, value):
--
1.7.9.2