rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.390, 1.391 policycoreutils.spec, 1.557, 1.558

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23974

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Sep 12 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-9
- Fix semanage help display


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- policycoreutils-rhat.patch	8 Sep 2008 21:03:49 -0000	1.390
+++ policycoreutils-rhat.patch	12 Sep 2008 15:45:19 -0000	1.391
@@ -92,7 +92,7 @@
  }
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/semanage/semanage	2008-09-08 14:46:57.000000000 -0400
++++ policycoreutils-2.0.55/semanage/semanage	2008-09-12 11:43:28.000000000 -0400
 @@ -20,7 +20,7 @@
  #                                        02111-1307  USA
  #
@@ -107,7 +107,7 @@
  
  	def usage(message = ""):
 -		print _("""
-+               raise ValueError(_("""
++               text = _("""
 +semanage [ -S store ] -i [ input_file | - ]
 +
  semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
@@ -121,15 +121,16 @@
  	-l, --list       List the OBJECTS
  	-C, --locallist  List OBJECTS local customizations
  	-D, --deleteall  Remove all OBJECTS local customizations
-@@ -91,9 +94,8 @@
+@@ -90,10 +93,9 @@
+ 
  	-s, --seuser     SELinux User Name
  	-t, --type       SELinux Type for the object
- 	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
--""")
+-	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
++	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only
+ """)
 -		print message
 -		sys.exit(1)
-+%s
-+""") % message)
++               raise ValueError("%s\n%s" % (text, message))
  		
  	def errorExit(error):
  		sys.stderr.write("%s: " % sys.argv[0])
@@ -204,7 +205,8 @@
 +		object = argv[0]
  		option_dict=get_options()
  		if object not in option_dict.keys():
- 			usage(_("%s not defined") % object)
+-			usage(_("%s not defined") % object)
++			usage(_("Invalid parameter %s not defined") % object)
  			
 -		args = sys.argv[2:]
 +		args = argv[1:]


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- policycoreutils.spec	11 Sep 2008 13:55:11 -0000	1.557
+++ policycoreutils.spec	12 Sep 2008 15:45:21 -0000	1.558
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Fri Sep 12 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-9
+- Fix semanage help display
+
 * Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-8
 - Only call gen_requires once in sepolgen