* Mon Nov 19 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-20

- Don't show error on missing policy.xml
This commit is contained in:
Daniel J Walsh 2007-11-19 22:38:48 +00:00
parent 616f54d725
commit b458bb5fd5
2 changed files with 6 additions and 3 deletions

View File

@ -294,7 +294,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po
diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.31/semanage/seobject.py diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.31/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2007-10-07 21:46:43.000000000 -0400 --- nsapolicycoreutils/semanage/seobject.py 2007-10-07 21:46:43.000000000 -0400
+++ policycoreutils-2.0.31/semanage/seobject.py 2007-11-09 12:00:35.000000000 -0500 +++ policycoreutils-2.0.31/semanage/seobject.py 2007-11-19 17:35:04.000000000 -0500
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
#! /usr/bin/python -E #! /usr/bin/python -E
-# Copyright (C) 2005 Red Hat -# Copyright (C) 2005 Red Hat
@ -332,7 +332,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po
+ desc = re.sub("\n", " ", desc) + desc = re.sub("\n", " ", desc)
+ booleans_dict[i.get('name')] = (_("global"), i.get('dftval'), desc) + booleans_dict[i.get('name')] = (_("global"), i.get('dftval'), desc)
+except IOError, e: +except IOError, e:
+ print _("Failed to translate booleans.\n%s") % e + #print _("Failed to translate booleans.\n%s") % e
+ pass + pass
+ +
def validate_level(raw): def validate_level(raw):

View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.0.31 Version: 2.0.31
Release: 19%{?dist} Release: 20%{?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
@ -207,6 +207,9 @@ if [ "$1" -ge "1" ]; then
fi fi
%changelog %changelog
* Mon Nov 19 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-20
- Don't show error on missing policy.xml
* Mon Nov 19 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-19 * Mon Nov 19 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-19
- GUI Enhancements - GUI Enhancements
- Fix cgi generation - Fix cgi generation