pool/apparmor
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 630890 from home:cboltz

Browse Source 
- make pyflakes 2.0 happy (unused variable) (SR 629206)

OBS-URL: https://build.opensuse.org/request/show/630890
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=217
This commit is contained in:
Christian Boltz 2018-08-22 11:38:18 +00:00 committed by Git OBS Bridge
parent 77fc31b80c
commit 2fb0399867
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apparmor.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 22 11:32:59 UTC 2018 - suse-beta@cboltz.de
- make pyflakes 2.0 happy (unused variable) (SR 629206)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 8 15:37:32 UTC 2018 - scabrero@suse.de Tue May 8 15:37:32 UTC 2018 - scabrero@suse.de

8
apparmor.spec
View File

@ -68,12 +68,15 @@ Patch8: aa-teardown-path.diff
# fix permissions of apparmor.systemd (boo#1090545, merged upstream 2018-04-27 https://gitlab.com/apparmor/apparmor/merge_requests/106) # fix permissions of apparmor.systemd (boo#1090545, merged upstream 2018-04-27 https://gitlab.com/apparmor/apparmor/merge_requests/106)
Patch9: fix-apparmor-systemd-perms.diff Patch9: fix-apparmor-systemd-perms.diff
# exclude the /etc/apparmor.d/cache.d directory from aa-logprof parsing # exclude the /etc/apparmor.d/cache.d directory from aa-logprof parsing (merged upstream 2018-04-30 https://gitlab.com/apparmor/apparmor/merge_requests/110/diffs)
Patch10: logprof-skip-cache-d.diff Patch10: logprof-skip-cache-d.diff
# bug 1092099 - Allow smbd to load new shared libraries. Allow Winbindd to read and write new kerberos cache location # bug 1092099 - Allow smbd to load new shared libraries. Allow Winbindd to read and write new kerberos cache location (accepted upstream 2018-05-09 https://gitlab.com/apparmor/apparmor/merge_requests/121 - slightly different patch)
Patch11: fix-samba-profiles.patch Patch11: fix-samba-profiles.patch
# SR 629206 - make pyflakes 2.0 happy (unused variable)
Patch12: make-pyflakes-happy.diff
PreReq: sed PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define apparmor_bin_prefix /lib/apparmor %define apparmor_bin_prefix /lib/apparmor
@ -365,6 +368,7 @@ SubDomain.
%patch9 -p1 %patch9 -p1
%patch10 %patch10
%patch11 -p1 %patch11 -p1
%patch12 -p1
%build %build
export SUSE_ASNEEDED=0 export SUSE_ASNEEDED=0

13
make-pyflakes-happy.diff Normal file
View File

@ -0,0 +1,13 @@
diff --git a/utils/apparmor/sandbox.py b/utils/apparmor/sandbox.py
index 51048f6f..17e413ea 100644
--- a/utils/apparmor/sandbox.py
+++ b/utils/apparmor/sandbox.py
@@ -718,7 +718,7 @@ def run_xsandbox(command, opt):
# aa-exec
try:
rc, report = aa_exec(command, opt, x.new_environ, required_rules)
- except Exception as e:
+ except Exception:
x.cleanup()
raise
x.cleanup()