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-09-12 11:48:15.000000000 -0400 +++ policycoreutils-2.0.55/semanage/semanage 2008-09-12 11:49:59.000000000 -0400 @@ -43,7 +43,7 @@ if __name__ == '__main__': def usage(message = ""): - raise ValueError(_(""" + text = _(""" semanage [ -S store ] -i [ input_file | - ] semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n] @@ -94,8 +94,8 @@ -s, --seuser SELinux User Name -t, --type SELinux Type for the object -r, --range MLS/MCS Security Range (MLS/MCS Systems only) -%s -""") % message) +""") + raise ValueError("%s\n%s" % (text, message)) def errorExit(error): sys.stderr.write("%s: " % sys.argv[0]) @@ -198,7 +198,7 @@ object = argv[0] option_dict=get_options() if object not in option_dict.keys(): - usage(_("%s not defined") % object) + usage(_("Invalid parameter %s not defined") % object) args = argv[1:]