nnd/selinux-refpolicy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix regex escape sequence error.

Browse Source 
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.
This commit is contained in:
Adam Duskett 2017-10-10 18:00:30 -04:00
parent 570bfa8cbd
commit 6c9cc47e6c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
support/genhomedircon.py
View File

@ -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