-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Customized output was wrong in semanage extract.
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iEYEARECAAYFAlJpNowACgkQrlYvE4MpobPHtwCeJpFqobKzeOBFk03r00Dro5le
jlIAnjGPerQvUDdVLTM8/7TADDy46ZQm
=emRq
-----END PGP SIGNATURE-----
>From aea91f2fd8bc830c8cdec093d161f62a700cd076 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@xxxxxxxxxx>
Date: Fri, 11 Oct 2013 09:07:59 -0400
Subject: [PATCH 56/74] Fix customized of fcontext and booleans to return
proper transaction code
---
policycoreutils/semanage/seobject.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py
index ebbe4e7..b0c88cd 100644
--- a/policycoreutils/semanage/seobject.py
+++ b/policycoreutils/semanage/seobject.py
@@ -2003,11 +2003,11 @@ class fcontextRecords(semanageRecords):
keys.sort()
for k in keys:
if fcon_dict[k]:
- l.append("-a -f '%s' -t %s '%s'" % (k[1], fcon_dict[k][2], k[0]))
+ l.append("-a -f %s -t %s '%s'" % (file_type_str_to_option[k[1]], fcon_dict[k][2], k[0]))
if len(self.equiv):
for target in self.equiv.keys():
- l.append("-a -e %s %s" % (target, self.equiv[target]))
+ l.append("-a -e %s %s" % (self.equiv[target], target))
return l
def list(self, heading = 1, locallist = 0 ):
@@ -2193,7 +2193,7 @@ class booleanRecords(semanageRecords):
keys.sort()
for k in keys:
if ddict[k]:
- l.append("-%s %s" % (ddict[k][2], k))
+ l.append("-m -%s %s" % (ddict[k][2], k))
return l
def list(self, heading = True, locallist = False, use_file = False):
--
1.8.3.1
