From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SmStl-0004lK-31 for garchives@archives.gentoo.org; Wed, 04 Jul 2012 16:57:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEC71E0539; Wed, 4 Jul 2012 16:57:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BDF90E0539 for ; Wed, 4 Jul 2012 16:57:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20CC41B4025 for ; Wed, 4 Jul 2012 16:57:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E8E67E5436 for ; Wed, 4 Jul 2012 16:57:40 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1341420991.84d93951fa8e2833ff4dcb8a3ff40ac9548e7b0c.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: support/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: support/comment_move_decl.sed support/get_type_attr_decl.sed support/pyplate.py X-VCS-Directories: support/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 84d93951fa8e2833ff4dcb8a3ff40ac9548e7b0c X-VCS-Branch: master Date: Wed, 4 Jul 2012 16:57:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c63a6307-8c81-453a-8a44-770c92b4c62f X-Archives-Hash: 2a80791ad43a6c56f7da57dbf35d1341 commit: 84d93951fa8e2833ff4dcb8a3ff40ac9548e7b0c Author: Sven Vermeulen siphos be> AuthorDate: Wed Jul 4 16:56:31 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Wed Jul 4 16:56:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-refp= olicy.git;a=3Dcommit;h=3D84d93951 Some more backports --- support/comment_move_decl.sed | 1 + support/get_type_attr_decl.sed | 7 ++++++- support/pyplate.py | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/support/comment_move_decl.sed b/support/comment_move_decl.se= d index 601c4f7..00b94b6 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 th= e 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 wa= s moved by the build process: &/ =20 :nextline diff --git a/support/get_type_attr_decl.sed b/support/get_type_attr_decl.= sed index 69c6ccd..5c7a6a8 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. =20 /require \{/,/} # end require/b nextline @@ -10,4 +10,9 @@ p } =20 +/^[[:blank:]]*role[[:blank:]]+[a-zA-Z_]+[[:blank:]]*;/{ + s/^[[:blank:]]+// + p +} + :nextline diff --git a/support/pyplate.py b/support/pyplate.py index 2e5a938..44b662a 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')) =20 - class ExecTemplateNode(LeafTemplateNode): def __init__(self, parent, s): LeafTemplateNode.__init__(self, parent, s)