7178811 installadm create-manifest fails when mac criteria is specified
authorJack Schwartz <Jack.Schwartz@Oracle.COM>
Fri, 29 Jun 2012 10:15:59 -0700
changeset 1736 f46c1e74f99e
parent 1735 34c1275c4633
child 1737 c20116627c69
7178811 installadm create-manifest fails when mac criteria is specified
usr/src/cmd/ai-webserver/data_files.py
--- a/usr/src/cmd/ai-webserver/data_files.py	Fri Jun 29 10:12:00 2012 -0700
+++ b/usr/src/cmd/ai-webserver/data_files.py	Fri Jun 29 10:15:59 2012 -0700
@@ -173,17 +173,18 @@
             value_elem = lxml.etree.SubElement(crit, "value")
             value_elem.text = value_or_range
 
-    try:
-        verifyXML.prepValuesAndRanges(root, db, table)
-    except ValueError as err:
-        raise ValueError(_("Error:\tCriteria error: %s") % err)
-
     # Verify the generated criteria DOM
     root, errors = verifyXML.verifyRelaxNGManifest(schema,
                         StringIO.StringIO(lxml.etree.tostring(root)))
     if errors:
         raise ValueError(_("Error: Criteria failed validation:\n\t%s") %
                            errors.message)
+
+    try:
+        verifyXML.prepValuesAndRanges(root, db, table)
+    except ValueError as err:
+        raise ValueError(_("Error:\tCriteria error: %s") % err)
+
     return root