- Update to upstream

- List types available for sandbox in usage statement
This commit is contained in:
Dan Walsh 2010-11-24 13:44:58 -05:00
parent f0e85a70d6
commit 63fda8aa74

View File

@ -2054,7 +2054,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
@python test_sandbox.py -v
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.84/sandbox/sandbox
--- nsapolicycoreutils/sandbox/sandbox 2010-06-16 08:03:38.000000000 -0400
+++ policycoreutils-2.0.84/sandbox/sandbox 2010-11-24 13:39:45.000000000 -0500
+++ policycoreutils-2.0.84/sandbox/sandbox 2010-11-24 13:44:32.000000000 -0500
@@ -1,5 +1,6 @@
-#! /usr/bin/python -E
+#! /usr/bin/python -Es
@ -2190,7 +2190,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
+
def __parse_options(self):
from optparse import OptionParser
+ types = "\t" + "\n\t".join(setools.seinfo(setools.ATTRIBUTE, "sandbox_x_type")[0]['types'])
+ types = "\t" + "\n\t".join(setools.seinfo(setools.ATTRIBUTE, "sandbox_type")[0]['types'])
usage = _("""
-sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [[-i file ] ...] [ -t type ] command
+sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [ -w windowsize ] [[-i file ] ...] [ -t type ] command