MSVSphere Packaging Team
2 months ago
parent
dd06ffe2ea
commit
90d99aed37
GPG Key ID:
B2B0B9F29E528FE8
@ -1 +1 @@
|
||||
SOURCES/setroubleshoot-3.3.33.tar.gz
|
||||
SOURCES/setroubleshoot-3.3.34.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
6d26c20ec838350e657eeedfe4b5c82f2b608992 SOURCES/setroubleshoot-3.3.33.tar.gz
|
||||
20927da4081df832fc830c47002c604ed81f6dbe SOURCES/setroubleshoot-3.3.34.tar.gz
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From dce909e06ba1471d5bbc2174bd7672be684bdf64 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Lautrbach <lautrbach@redhat.com>
|
||||
Date: Mon, 3 Jun 2024 15:44:28 +0200
|
||||
Subject: [PATCH] gitlab-ci: fix Fedora and Debian build requirements
|
||||
Content-type: text/plain
|
||||
|
||||
Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||
---
|
||||
.gitlab-ci.yml | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
||||
index bea5081bb0b9..f316357a9164 100644
|
||||
--- a/.gitlab-ci.yml
|
||||
+++ b/.gitlab-ci.yml
|
||||
@@ -31,6 +31,7 @@ build:debian:
|
||||
apt-get -y install autoconf automake libglib2.0-dev libdbus-glib-1-dev libnotify-dev
|
||||
libgtk-3-dev gcc python3-selinux python3-gi python3-dbus python3-six python3-sepolicy
|
||||
xdg-utils make intltool libaudit-dev libauparse-dev python3-pip python3-dasbus
|
||||
+ python3-setuptools
|
||||
- ./autogen.sh
|
||||
- make
|
||||
- make install
|
||||
@@ -44,7 +45,8 @@ build:fedora:
|
||||
dnf -y install make gcc automake autoconf libcap-ng-devel intltool gettext
|
||||
python3 python3-devel desktop-file-utils dbus-glib-devel gtk2-devel libnotify-devel
|
||||
audit-libs-devel libselinux-devel polkit-devel python3-libselinux python3-dasbus
|
||||
- python3-gobject gtk3-devel xdg-utils intltool gettext python3 python3-devel
|
||||
+ python3-gobject gtk3-devel xdg-utils intltool gettext
|
||||
+ python3-setuptools python3-wheel python3-pip
|
||||
- ./autogen.sh
|
||||
- make
|
||||
- make install
|
||||
--
|
||||
2.44.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,62 +0,0 @@
|
||||
From e72f22bac65ed67849d8df28b7119c76df077c67 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Thu, 22 Aug 2024 12:14:53 +0200
|
||||
Subject: [PATCH] Disable bug reporting, if libreport is not available
|
||||
|
||||
libreport doesn't support JIRA, so it won't be in RHEL.
|
||||
|
||||
Resolves: RHEL-52902
|
||||
|
||||
Signed-off-by: Michal Srb <michal@redhat.com>
|
||||
---
|
||||
src/setroubleshoot/browser.py | 20 ++++++++++++++------
|
||||
1 file changed, 14 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/setroubleshoot/browser.py b/src/setroubleshoot/browser.py
|
||||
index c98b075..33272db 100644
|
||||
--- a/src/setroubleshoot/browser.py
|
||||
+++ b/src/setroubleshoot/browser.py
|
||||
@@ -64,10 +64,17 @@ from setroubleshoot.util import *
|
||||
from setroubleshoot.html_util import html_to_text
|
||||
import re
|
||||
import dbus
|
||||
-import report
|
||||
-import report.io
|
||||
-import report.io.GTKIO
|
||||
-import report.accountmanager
|
||||
+
|
||||
+has_libreport = False
|
||||
+try:
|
||||
+ import report
|
||||
+ import report.io
|
||||
+ import report.io.GTKIO
|
||||
+ import report.accountmanager
|
||||
+ has_libreport = True
|
||||
+except ImportError:
|
||||
+ # Bug reporting won't be available
|
||||
+ pass
|
||||
|
||||
from gi.repository import Gio
|
||||
|
||||
@@ -278,7 +285,8 @@ class BrowserApplet:
|
||||
self.make_treeview()
|
||||
self.troubleshoot_visible = False
|
||||
self.current_alert = -1
|
||||
- self.accounts = report.accountmanager.AccountManager()
|
||||
+ if has_libreport:
|
||||
+ self.accounts = report.accountmanager.AccountManager()
|
||||
|
||||
def get_current_alert(self):
|
||||
try:
|
||||
@@ -541,7 +549,7 @@ class BrowserApplet:
|
||||
report_button.connect("clicked", self.fix_bug, alert.local_id, plugin.analysis_id)
|
||||
vbox.add(report_button)
|
||||
|
||||
- elif plugin.report_bug:
|
||||
+ elif plugin.report_bug and has_libreport:
|
||||
report_button = Gtk.Button()
|
||||
report_button.set_label(_("Report\nBug"))
|
||||
report_button.show()
|
||||
--
|
||||
2.46.0
|
||||
|
||||
Loading…
Reference in new issue