commit: 7d6bc428460407eec6715b9aa2d303cc3a8f36a1
Author: Adam Duskett <Adamduskett <AT> outlook <DOT> com>
AuthorDate: Tue Oct 10 22:00:30 2017 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 12:59:08 2017 +0000
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7d6bc428
fix regex escape sequence error.
python3.6 will error out with the message "invalid escape sequence"
in genhomedircon.py. This patch fixes these errors by turning the string
in the into a raw string.
support/genhomedircon.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/support/genhomedircon.py b/support/genhomedircon.py
index 036f5cc9..6662f412 100644
--- a/support/genhomedircon.py
+++ b/support/genhomedircon.py
@@ -189,13 +189,13 @@ def oldgenhomedircon(filecontextdir, filecontext):
addme = 1
for regex in prefix_regex:
#match a trailing (/*)? which is actually a bug in
rpc_pipefs
- regex = re.sub("\(/\*\)\?$", "", regex)
+ regex = re.sub(r"\(/\*\)\?$", "", regex)
#match a trailing .+
- regex = re.sub("\.+$", "", regex)
+ regex = re.sub(r"\.+$", "", regex)
#match a trailing .*
- regex = re.sub("\.\*$", "", regex)
+ regex = re.sub(r"\.\*$", "", regex)
#strip a (/.*)? which matches anything trailing to a
/*$ which matches trailing /'s
- regex = re.sub("\(\/\.\*\)\?", "", regex)
+ regex = re.sub(r"\(\/\.\*\)\?", "", regex)
regex = regex + "/*$"
if re.search(regex, potential, 0):
addme = 0
@@ -391,13 +391,13 @@ class selinuxConfig:
exists=1
for regex in prefix_regex:
#match a trailing (/*)? which is actually a bug in
rpc_pipefs
- regex = re.sub("\(/\*\)\?$", "", regex)
+ regex = re.sub(r"\(/\*\)\?$", "", regex)
#match a trailing .+
- regex = re.sub("\.+$", "", regex)
+ regex = re.sub(r"\.+$", "", regex)
#match a trailing .*
- regex = re.sub("\.\*$", "", regex)
+ regex = re.sub(r"\.\*$", "", regex)
#strip a (/.*)? which matches anything trailing to a
/*$ which matches trailing /'s
- regex = re.sub("\(\/\.\*\)\?", "", regex)
+ regex = re.sub(r"\(\/\.\*\)\?", "", regex)
regex = regex + "/*$"
if re.search(regex, home, 0):
exists = 0
