Compare commits

...

No commits in common. "c8s" and "imports/c8s/python-slip-0.6.4-11.el8" have entirely different histories.

8 changed files with 3 additions and 89 deletions

View File

@ -1 +0,0 @@
1

21
.gitignore vendored
View File

@ -1,20 +1 @@
python-slip-0.2.11.tar.bz2
/python-slip-0.2.12.tar.bz2
/python-slip-0.2.13.tar.bz2
/python-slip-0.2.14.tar.bz2
/python-slip-0.2.15.tar.bz2
/python-slip-0.2.16.tar.bz2
/python-slip-0.2.17.tar.bz2
/python-slip-0.2.18.tar.bz2
/python-slip-0.2.19.tar.bz2
/python-slip-0.2.20.tar.bz2
/python-slip-0.2.21.tar.bz2
/python-slip-0.2.22.tar.bz2
/python-slip-0.2.23.tar.bz2
/python-slip-0.2.24.tar.bz2
/python-slip-0.4.0.tar.bz2
/python-slip-0.6.0.tar.bz2
/python-slip-0.6.1.tar.bz2
/python-slip-0.6.2.tar.bz2
/python-slip-0.6.3.tar.bz2
/python-slip-0.6.4.tar.bz2
SOURCES/python-slip-0.6.4.tar.bz2

1
.python-slip.metadata Normal file
View File

@ -0,0 +1 @@
eac3398c7294e7c5564f2f8eac9720e78e8a4407 SOURCES/python-slip-0.6.4.tar.bz2

View File

@ -1,6 +1,6 @@
Name: python-slip
Version: 0.6.4
Release: 13%{?dist}
Release: 11%{?dist}
Summary: Convenience, extension and workaround code for Python
Group: System Environment/Libraries
@ -9,12 +9,6 @@ URL: https://github.com/nphilipp/python-slip
Source0: https://github.com/nphilipp/python-slip/releases/download/python-slip-%{version}/python-slip-%{version}.tar.bz2
BuildArch: noarch
# Make firewalld to not log errors when running commands as root,
# when polkitd is not present
# Fixed upstream: https://github.com/nphilipp/python-slip/commit/39787d6773f628119876dd88bb0106e77a65201e
# Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2076606
Patch0: fix-firewalld-logging.patch
BuildRequires: python3
BuildRequires: python3-devel
@ -66,7 +60,6 @@ functions and decorators for integrating a dbus service with PolicyKit.
%prep
%setup -q
%patch0 -p1
find . -name '*.py' -o -name '*.py.in' | xargs sed -i '1s|^#!/usr/bin/python|#!%{__python3}|'
@ -95,14 +88,6 @@ make install PYTHON=%{__python3} DESTDIR=%buildroot
%{python3_sitelib}/slip.dbus-%{version}-py%{python3_version}.egg-info
%changelog
* Tue May 03 2022 Charalampos Stratakis <cstratak@redhat.com> - 0.6.4-13
- Release bump
* Tue Apr 26 2022 Charalampos Stratakis <cstratak@redhat.com> - 0.6.4-12
- Make firewalld to not log errors when running commands as root
in the absence of polkitd.
Resolves: rhbz#2076606
* Tue Jun 05 2018 Petr Viktorin <pviktori@redhat.com> - 0.6.4-11
- Remove the Python 2 subpackages
https://bugzilla.redhat.com/show_bug.cgi?id=1566681

View File

@ -1,39 +0,0 @@
diff --git a/slip/dbus/polkit.py b/slip/dbus/polkit.py
index e92db4d..cc3dbd8 100644
--- a/slip/dbus/polkit.py
+++ b/slip/dbus/polkit.py
@@ -206,17 +206,17 @@ class PolKit(object):
@property
def _interface(self):
if not PolKit.__interface:
- PolKit.__interface = dbus.Interface(self._bus.get_object(
- self._dbus_name, self._dbus_path),
- self._dbus_interface)
+ try:
+ PolKit.__interface = dbus.Interface(self._bus.get_object(
+ self._dbus_name, self._dbus_path),
+ self._dbus_interface)
+ except dbus.DBusException:
+ pass
return PolKit.__interface
@property
def _polkit_present(self):
- try:
- return bool(self._interface)
- except dbus.DBusException:
- return False
+ return bool(self._interface)
def __dbus_system_bus_name_uid(self, system_bus_name):
bus_object = self._bus.get_object(
@@ -258,8 +258,7 @@ class PolKit(object):
challenge=True, details={}):
if not self._polkit_present:
- reply_handler(
- action_id is None or
+ return reply_handler(action_id is None or
self.__dbus_system_bus_name_uid(system_bus_name) == 0)
flags = 0

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,6 +0,0 @@
execute:
how: tmt
/smoke-import:
execute+:
script: python3 -c "import slip"

View File

@ -1 +0,0 @@
SHA512 (python-slip-0.6.4.tar.bz2) = 30f44835fe568413096ea630d4113fa1e6434efd1d2f1849557acb0814684b87bea41b11190017edc0147a89e962faf88c7b45cd3932e7139ef5002d89e95bb3