rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.335, 1.336 policycoreutils.spec, 1.477, 1.478

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21785

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Nov 19 2007 Dan Walsh <dwalsh at redhat.com> 2.0.31-20
- Don't show error on missing policy.xml


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- policycoreutils-rhat.patch	19 Nov 2007 18:18:08 -0000	1.335
+++ policycoreutils-rhat.patch	19 Nov 2007 22:38:48 -0000	1.336
@@ -294,7 +294,7 @@
  
 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
-+++ 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 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005 Red Hat 
@@ -332,7 +332,7 @@
 +              desc = re.sub("\n", " ", desc)
 +              booleans_dict[i.get('name')] = (_("global"), i.get('dftval'), desc)
 +except IOError, e:
-+       print _("Failed to translate booleans.\n%s") % e
++       #print _("Failed to translate booleans.\n%s") % e
 +       pass
 +
  def validate_level(raw):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- policycoreutils.spec	19 Nov 2007 21:27:12 -0000	1.477
+++ policycoreutils.spec	19 Nov 2007 22:38:48 -0000	1.478
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.31
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -207,6 +207,9 @@
 fi
 
 %changelog
+* Mon Nov 19 2007 Dan Walsh <dwalsh at redhat.com> 2.0.31-20
+- Don't show error on missing policy.xml
+
 * Mon Nov 19 2007 Dan Walsh <dwalsh at redhat.com> 2.0.31-19
 - GUI Enhancements
   - Fix cgi generation