<div dir="ltr">Hello,<br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 15, 2015 at 12:45 AM, Christian Boltz <span dir="ltr"><<a href="mailto:apparmor@cboltz.de" target="_blank">apparmor@cboltz.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello,<br>
<br>
load_variables() used a nearly-correct regex. Drop it and use<br>
re_match_include() instead.<br>
<br>
<br>
<br>
[ 50-severity-use-re_match_include.diff ]<br>
<br>
=== modified file utils/apparmor/severity.py<br>
--- utils/apparmor/severity.py 2015-06-06 14:53:16.868029000 +0200<br>
+++ utils/apparmor/severity.py 2015-06-14 21:09:57.462206062 +0200<br>
@@ -15,6 +15,7 @@<br>
 import os<br>
 import re<br>
 from apparmor.common import AppArmorException, open_file_read, warn, convert_regexp # , msg, error, debug<br>
+from apparmor.regex import re_match_include<br>
<br>
 class Severity(object):<br>
   def __init__(self, dbname=None, default_rank=10):<br>
@@ -179,16 +180,14 @@<br>
<br>
   def load_variables(self, prof_path):<br>
     """Loads the variables for the given profile"""<br>
-Â Â Â Â regex_include = re.compile('^#?include\s*<(\S*)>')<br>
     if os.path.isfile(prof_path):<br>
       with open_file_read(prof_path) as f_in:<br>
         for line in f_in:<br>
           line = line.strip()<br>
           # If any includes, load variables from them first<br>
-Â Â Â Â Â Â Â Â Â Â match = regex_include.search(line)<br>
+Â Â Â Â Â Â Â Â Â Â match = re_match_include(line)<br>
           if match:<br>
-Â Â Â Â Â Â Â Â Â Â Â Â new_path = match.groups()[0]<br>
-Â Â Â Â Â Â Â Â Â Â Â Â new_path = self.PROF_DIR + '/' + new_path<br>
+Â Â Â Â Â Â Â Â Â Â Â Â new_path = self.PROF_DIR + '/' + match<br>
             self.load_variables(new_path)<br>
           else:<br>
             # Remove any comments<br>
<br>
<br></blockquote><div>Thanks for the patch.<br><br>Acked-by: Kshitij Gupta <<a href="mailto:kgupta8592@gmail.com" target="_blank">kgupta8592@gmail.com</a>>. <br><div><br></div>Regards, <br><br></div><div>Kshitij Gupta<br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Regards,<br>
<br>
Christian Boltz<br>
<span class=""><font color="#888888">--<br>
Jetzt bringt das KDE schon ein eigenes shutdown mit? Ist ja ein kHammer!<br>
(und morgen müssen wir kkernel (von klinux) und kinit installieren, was<br>
dann mit kbash und kperl das knetzwerk, kindernet, papache, kquid und<br>
kostfix knochfährt und dann das kX.org köffnet und kkde kanzeigt, kurz:<br>
Kunix! SKNR.)Â Â [Steffen Dettmer in suse-linux]<br>
<br>
<br>
--<br>
AppArmor mailing list<br>
<a href="mailto:AppArmor@lists.ubuntu.com">AppArmor@lists.ubuntu.com</a><br>
Modify settings or unsubscribe at: <a href="https://lists.ubuntu.com/mailman/listinfo/apparmor" rel="noreferrer" target="_blank">https://lists.ubuntu.com/mailman/listinfo/apparmor</a><br>
</font></span></blockquote></div><br></div></div>