[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/tools/scripts
From:       Jos van den Oever <jos () vandenoever ! info>
Date:       2010-11-11 13:02:25
Message-ID: 20101111130225.55942AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195531 by vandenoever:

Filter out false positives reported by libxml2.

 M  +10 -3     profileOfficeFileLoading.py  


--- trunk/koffice/tools/scripts/profileOfficeFileLoading.py #1195530:1195531
@@ -84,6 +84,13 @@
 			+ "' duration='" + str(duration) + "']"
 		self.testname = None
 
+def containsRealError(err):
+	# some errors reported by libxml2 are false positives, we filter them
+	# out
+	if err.find("ERROR:RELAXNGV:RELAXNG_ERR_CONTENTVALID: Element styles failed to validate content"):
+		return None
+	return err
+
 class odfvalidator:
 	def __init__(self):
 		path = sys.path[0]
@@ -103,15 +110,15 @@
 			return str(e)
 		err = self.validateFile(zip, 'content.xml',
 				self.relaxNGValidator)
-		if (err):
+		if (containsRealError(err)):
 			return err
 		err = self.validateFile(zip, 'styles.xml',
 				self.relaxNGValidator)
-		if (err):
+		if (containsRealError(err)):
 			return err
 		err = self.validateFile(zip, 'META-INF/manifest.xml',
 				self.relaxNGManifextValidator)
-		if (err):
+		if (containsRealError(err)):
 			return err
 		return None
 
[prev in list] [next in list] [prev in thread] [next in thread]