-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk7vrPIACgkQrlYvE4MpobOEHgCg2PFtjdtQLyD7N47+a6Cyq5pv VN8An3lBdPKpwzWkET8A4FPMInkR6XsC =Aafq -----END PGP SIGNATURE-----
>From eee8ae045f5ade8d99e6e611c53be5c6a3663c7a Mon Sep 17 00:00:00 2001 From: Dan Walsh <dwalsh@xxxxxxxxxx> Date: Mon, 5 Dec 2011 14:26:16 -0500 Subject: [PATCH 23/25] policycoreutils: Remove excess whitespace Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- policycoreutils/semanage/seobject.py | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py index b8f978d..e5b6303 100644 --- a/policycoreutils/semanage/seobject.py +++ b/policycoreutils/semanage/seobject.py @@ -165,7 +165,6 @@ class semanageRecords: transaction = False handle = None store = None - def __init__(self, store): global handle @@ -333,7 +332,6 @@ class permissiveRecords(semanageRecords): name = semanage_module_get_name(mod) if name and name.startswith("permissive_"): l.append(name.split("permissive_")[1]) - return l def list(self, heading = 1, locallist = 0): @@ -885,7 +883,6 @@ class portRecords(semanageRecords): return ( k, proto_d, low, high ) def __add(self, port, proto, serange, type): - if is_mls_enabled == 1: if serange == "": serange = "s0" @@ -948,7 +945,6 @@ class portRecords(semanageRecords): self.commit() def __modify(self, port, proto, serange, setype): - if serange == "" and setype == "": if is_mls_enabled == 1: raise ValueError(_("Requires setype or serange")) @@ -1142,7 +1138,6 @@ class nodeRecords(semanageRecords): return newaddr, newmask, newprotocol def __add(self, addr, mask, proto, serange, ctype): - addr, mask, proto = self.validate(addr, mask, proto) if is_mls_enabled == 1: @@ -1214,7 +1209,6 @@ class nodeRecords(semanageRecords): self.commit() def __modify(self, addr, mask, proto, serange, setype): - addr, mask, proto = self.validate(addr, mask, proto) if serange == "" and setype == "": @@ -1741,7 +1735,6 @@ class fcontextRecords(semanageRecords): self.begin() self.__modify(target, setype, ftype, serange, seuser) self.commit() - def deleteall(self): (rc, flist) = semanage_fcontext_list_local(self.sh) -- 1.7.8