minor fixes

stamparm · stamparm · commit 452ef202ae13 · 2012-06-17T22:48:23.000Z
diff --git a/lib/core/dump.py b/lib/core/dump.py
@@ -512,8 +512,7 @@ def query(self, query, queryRes):
         self.string(query, queryRes)
 
     def rFile(self, filePath, fileData):
-        if fileData:
-            self.string("%s file saved to" % filePath, fileData, sort=False)
+        self.string("%s file saved to" % filePath, fileData, sort=False)
 
     def registerValue(self, registerData):
         self.string("Registry key value data", registerData, sort=False)
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -265,6 +265,7 @@
 # Regular expressions used for parsing error messages (--parse-errors)
 ERROR_PARSING_REGEXES = (
                           r"<b>[^<]*(fatal|error|warning|exception)[^<]*</b>:?\s*(?P<result>.+?)<br\s*/?\s*>",
+                          r"(?m)^(fatal|error|warning|exception):?\s*(?P<result>.+?)$",
                           r"<li>Error Type:<br>(?P<result>.+?)</li>",
                           r"error '[0-9a-f]{8}'((<[^>]+>)|\s)+(?P<result>[^<>]+)"
                         )

Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,7 @@`
`265`	`265`	`# Regular expressions used for parsing error messages (--parse-errors)`
`266`	`266`	`ERROR_PARSING_REGEXES = (`
`267`	`267`	`r"<b>[^<](fatal\|error\|warning\|exception)[^<]</b>:?\s(?P<result>.+?)<br\s/?\s*>",`
	`268`	`+ r"(?m)^(fatal\|error\|warning\|exception):?\s*(?P<result>.+?)$",`
`268`	`269`	`r"<li>Error Type:<br>(?P<result>.+?)</li>",`
`269`	`270`	`r"error '[0-9a-f]{8}'((<[^>]+>)\|\s)+(?P<result>[^<>]+)"`
`270`	`271`	`)`