Fix booleansPage not showing booleans

- Fix audit2allow -b
This commit is contained in:
Dan Walsh 2012-11-13 10:30:48 -05:00
parent 435b38a137
commit dcda6e4336
2 changed files with 23 additions and 5 deletions

View File

@ -33,6 +33,19 @@ index 77d8c80..a65a53f 100644
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
diff --git a/policycoreutils/audit2allow/audit2allow b/policycoreutils/audit2allow/audit2allow
index 8e0c396..18467c6 100644
--- a/policycoreutils/audit2allow/audit2allow
+++ b/policycoreutils/audit2allow/audit2allow
@@ -29,6 +29,8 @@ import sepolgen.defaults as defaults
import sepolgen.module as module
from sepolgen.sepolgeni18n import _
import selinux.audit2why as audit2why
+import locale
+locale.setlocale(locale.LC_ALL, '')
class AuditToPolicy:
VERSION = "%prog .1"
diff --git a/policycoreutils/audit2allow/sepolgen-ifgen b/policycoreutils/audit2allow/sepolgen-ifgen diff --git a/policycoreutils/audit2allow/sepolgen-ifgen b/policycoreutils/audit2allow/sepolgen-ifgen
index ef4bec3..9b313ec 100644 index ef4bec3..9b313ec 100644
--- a/policycoreutils/audit2allow/sepolgen-ifgen --- a/policycoreutils/audit2allow/sepolgen-ifgen
@ -338332,10 +338345,10 @@ index 0000000..2647bbc
+ sys.exit(0) + sys.exit(0)
diff --git a/policycoreutils/sepolicy/sepolicy/__init__.py b/policycoreutils/sepolicy/sepolicy/__init__.py diff --git a/policycoreutils/sepolicy/sepolicy/__init__.py b/policycoreutils/sepolicy/sepolicy/__init__.py
new file mode 100644 new file mode 100644
index 0000000..247d0fb index 0000000..96a7251
--- /dev/null --- /dev/null
+++ b/policycoreutils/sepolicy/sepolicy/__init__.py +++ b/policycoreutils/sepolicy/sepolicy/__init__.py
@@ -0,0 +1,123 @@ @@ -0,0 +1,124 @@
+#!/usr/bin/env python +#!/usr/bin/env python
+ +
+# Author: Thomas Liu <tliu@redhat.com> +# Author: Thomas Liu <tliu@redhat.com>
@ -338428,8 +338441,9 @@ index 0000000..247d0fb
+ return booleans_dict + return booleans_dict
+ +
+def boolean_category(boolean): +def boolean_category(boolean):
+ if boolean in self.booleans_dict: + booleans_dict = gen_bool_dict()
+ return _(self.booleans_dict[boolean][0]) + if boolean in booleans_dict:
+ return _(booleans_dict[boolean][0])
+ else: + else:
+ return _("unknown") + return _("unknown")
+ +

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.1.13 Version: 2.1.13
Release: 31%{?dist} Release: 32%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
# Based on git repository with tag 20101221 # Based on git repository with tag 20101221
@ -338,6 +338,10 @@ The policycoreutils-restorecond package contains the restorecond service.
%{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || : %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
%changelog %changelog
* Tue Nov 13 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-32
- Fix booleansPage not showing booleans
- Fix audit2allow -b
* Tue Nov 13 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-31 * Tue Nov 13 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-31
- Fix sepolicy booleans again - Fix sepolicy booleans again
- Fix man page - Fix man page