From 2fb0399867453b91114f3e6f36de26d7d62794810856454bffd3987029aaefbe Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Wed, 22 Aug 2018 11:38:18 +0000
Subject: [PATCH] Accepting request 630890 from home:cboltz

- 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
---
 apparmor.changes         |  5 +++++
 apparmor.spec            |  8 ++++++--
 make-pyflakes-happy.diff | 13 +++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 make-pyflakes-happy.diff

diff --git a/apparmor.changes b/apparmor.changes
index 989cc7d..5a8c335 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -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
 
diff --git a/apparmor.spec b/apparmor.spec
index 3d71255..02909bc 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -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)
 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
 
-# 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
 
+# SR 629206 - make pyflakes 2.0 happy (unused variable)
+Patch12:        make-pyflakes-happy.diff
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define apparmor_bin_prefix /lib/apparmor
@@ -365,6 +368,7 @@ SubDomain.
 %patch9 -p1
 %patch10
 %patch11 -p1
+%patch12 -p1
 
 %build
 export SUSE_ASNEEDED=0
diff --git a/make-pyflakes-happy.diff b/make-pyflakes-happy.diff
new file mode 100644
index 0000000..753cbdf
--- /dev/null
+++ b/make-pyflakes-happy.diff
@@ -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()