- Fix translation handling in file context page of system-config-selinux

This commit is contained in:
Dan Walsh 2010-08-23 11:20:16 -04:00
parent a0d0267634
commit fc15cdf18c
2 changed files with 9 additions and 6 deletions

View File

@ -409,7 +409,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py polic
+ self.error(e.args[0]) + self.error(e.args[0])
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.83/gui/fcontextPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.83/gui/fcontextPage.py
--- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.83/gui/fcontextPage.py 2010-07-30 13:50:41.000000000 -0400 +++ policycoreutils-2.0.83/gui/fcontextPage.py 2010-08-23 11:16:44.000000000 -0400
@@ -0,0 +1,223 @@ @@ -0,0 +1,223 @@
+## fcontextPage.py - show selinux mappings +## fcontextPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
@ -598,14 +598,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli
+ self.error(e.args[0]) + self.error(e.args[0])
+ +
+ def add(self): + def add(self):
+ ftype=["", "--", "-d", "-c", "-b", "-s", "-l", "-p" ]
+ fspec=self.fcontextEntry.get_text().strip() + fspec=self.fcontextEntry.get_text().strip()
+ type=self.fcontextTypeEntry.get_text().strip() + type=self.fcontextTypeEntry.get_text().strip()
+ mls=self.fcontextMLSEntry.get_text().strip() + mls=self.fcontextMLSEntry.get_text().strip()
+ list_model=self.fcontextFileTypeCombo.get_model() + list_model=self.fcontextFileTypeCombo.get_model()
+ iter = self.fcontextFileTypeCombo.get_active_iter() + active = self.fcontextFileTypeCombo.get_active()
+ ftype=list_model.get_value(iter,0)
+ self.wait() + self.wait()
+ (rc, out) = commands.getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype, fspec)) + (rc, out) = commands.getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype[active], fspec))
+ self.ready() + self.ready()
+ if rc != 0: + if rc != 0:
+ self.error(out) + self.error(out)

View File

@ -7,8 +7,8 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.0.83 Version: 2.0.83
Release: 18%{?dist} Release: 19%{?dist}
License: GPLv2+ License: GPLv2
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
Source1: http://www.nsa.gov/selinux/archives/sepolgen-%{sepolgenver}.tgz Source1: http://www.nsa.gov/selinux/archives/sepolgen-%{sepolgenver}.tgz
@ -315,6 +315,9 @@ fi
exit 0 exit 0
%changelog %changelog
* Mon Aug 23 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-19
- Fix translation handling in file context page of system-config-selinux
* Fri Aug 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-18 * Fri Aug 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-18
- Fix sandbox error handling - Fix sandbox error handling