diff options
| author |   Sven Vermeulen <sven.vermeulen@siphos.be> | 2012-07-04 18:56:31 +0200 |
|---|---|---|
| committer | Sven Vermeulen <sven.vermeulen@siphos.be> | 2012-07-04 18:56:31 +0200 |
| commit | 84d93951fa8e2833ff4dcb8a3ff40ac9548e7b0c (patch) | |
| tree | 801b1e95d8f350a0d7c3fb5c744df9242deefcf2 /support | |
| parent | Small updates (diff) | |
| download | hardened-refpolicy-84d93951fa8e2833ff4dcb8a3ff40ac9548e7b0c.tar.gz hardened-refpolicy-84d93951fa8e2833ff4dcb8a3ff40ac9548e7b0c.tar.bz2 hardened-refpolicy-84d93951fa8e2833ff4dcb8a3ff40ac9548e7b0c.zip | |
Some more backports
Diffstat (limited to 'support')
| -rw-r--r-- | support/comment_move_decl.sed | 1 | ||||
| -rw-r--r-- | support/get_type_attr_decl.sed | 7 | ||||
| -rw-r--r-- | support/pyplate.py | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/support/comment_move_decl.sed b/support/comment_move_decl.sed index 601c4f7e..00b94b6a 100644 --- a/support/comment_move_decl.sed +++ b/support/comment_move_decl.sed @@ -10,5 +10,6 @@ /^[[:blank:]]*fs_use_(xattr|task|trans) /s/^/# this line was moved by the build process: &/ /^[[:blank:]]*sid /s/^/# this line was moved by the build process: &/ /^[[:blank:]]*bool /s/^/# this line was moved by the build process: &/ +/^[[:blank:]]*role[[:blank:]]+[a-zA-Z_]+[[:blank:]]*;/s/^/# this line was moved by the build process: &/ :nextline diff --git a/support/get_type_attr_decl.sed b/support/get_type_attr_decl.sed index 69c6ccd4..5c7a6a80 100644 --- a/support/get_type_attr_decl.sed +++ b/support/get_type_attr_decl.sed @@ -1,5 +1,5 @@ #n -# print out type and attribute declarations that +# print out type, role and attribute declarations that # are not inside require and optional blocks. /require \{/,/} # end require/b nextline @@ -10,4 +10,9 @@ p } +/^[[:blank:]]*role[[:blank:]]+[a-zA-Z_]+[[:blank:]]*;/{ + s/^[[:blank:]]+// + p +} + :nextline diff --git a/support/pyplate.py b/support/pyplate.py index 2e5a9383..44b662ac 100644 --- a/support/pyplate.py +++ b/support/pyplate.py @@ -296,7 +296,6 @@ class ExpressionTemplateNode(LeafTemplateNode): else: stream.write(str(eval(self.s, globals(), data)).decode('utf-8')) - class ExecTemplateNode(LeafTemplateNode): def __init__(self, parent, s): LeafTemplateNode.__init__(self, parent, s) |