diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/sssd-optional-systemd.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/sssd-optional-systemd.patch')
| -rw-r--r-- | gnu/packages/patches/sssd-optional-systemd.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/gnu/packages/patches/sssd-optional-systemd.patch b/gnu/packages/patches/sssd-optional-systemd.patch deleted file mode 100644 index 0784fdc7aa..0000000000 --- a/gnu/packages/patches/sssd-optional-systemd.patch +++ /dev/null @@ -1,45 +0,0 @@ -Allow running sss_analyze without Python modules for systemd. -Upstream PR: https://github.com/SSSD/sssd/pull/6125 - -diff --git a/src/tools/analyzer/modules/request.py b/src/tools/analyzer/modules/request.py -index b96a23c05..28ac2f194 100644 ---- a/src/tools/analyzer/modules/request.py -+++ b/src/tools/analyzer/modules/request.py -@@ -1,8 +1,6 @@ - import re - import logging - --from sssd.source_files import Files --from sssd.source_journald import Journald - from sssd.parser import SubparsersAction - from sssd.parser import Option - -@@ -77,8 +75,10 @@ class RequestAnalyzer: - Instantiated source object - """ - if args.source == "journald": -+ from sssd.source_journald import Journald - source = Journald() - else: -+ from sssd.source_files import Files - source = Files(args.logdir) - return source - -@@ -143,7 +143,7 @@ class RequestAnalyzer: - self.consumed_logs.append(line.rstrip(line[-1])) - else: - # files source includes newline -- if isinstance(source, Files): -+ if type(source).__name__ == 'Files': - print(line, end='') - else: - print(line) -@@ -225,7 +225,7 @@ class RequestAnalyzer: - source.set_component(component, False) - self.done = "" - for line in self.matched_line(source, patterns): -- if isinstance(source, Journald): -+ if type(source).__name__ == 'Journald': - print(line) - else: - self.print_formatted(line, args.verbose) |