Merge pull request #52 from yast/huha-no-colors

Prevent Escape Sequences in the JSON Output
yast · Jan 4, 2024 · f02e81a · f02e81a
2 parents dee50da + d9d29dc
commit f02e81a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/yast2-journal.changes b/package/yast2-journal.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jan  4 13:40:35 UTC 2024 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Make sure not to get escape sequences (for colors) into the 
+  output of the 'journalctl --output json' command, even if
+  $SYSTEMD_COLORS is set in the environment (bsc#1218106)
+- 5.0.1
+
 -------------------------------------------------------------------
 Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <jreidinger@suse.cz>
 

diff --git a/package/yast2-journal.spec b/package/yast2-journal.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-journal
-Version:        5.0.0
+Version:        5.0.1
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0 or GPL-3.0

diff --git a/src/lib/y2journal/journalctl.rb b/src/lib/y2journal/journalctl.rb
@@ -59,7 +59,7 @@ def initialize(options = {}, matches = [])
 
     # Full journalctl command
     def command
-      "LANG=C /usr/bin/journalctl #{options_string} #{matches_string}".strip.squeeze(" ")
+      "SYSTEMD_COLORS='' LANG=C /usr/bin/journalctl #{options_string} #{matches_string}".strip.squeeze(" ")
     end
 
     # Output resulting of executing the command