usr/src/cmd/auto-install/ai_parse_manifest.py
changeset 862 e9f31f2f2f2d
parent 834 ebc61df501b2
child 947 29603af1b942
--- a/usr/src/cmd/auto-install/ai_parse_manifest.py	Tue Aug 17 18:22:44 2010 -0400
+++ b/usr/src/cmd/auto-install/ai_parse_manifest.py	Fri Aug 20 11:31:18 2010 -0600
@@ -42,7 +42,8 @@
     """
 
     try:
-        manifest_obj = ManifestServ(manifest_file, full_init=False)
+        manifest_obj = ManifestServ(manifest_file, full_init=False,
+                                    dtd_schema=True)
     except StandardError, err:
         print "Error creating in-memory copy of Manifest data."
         print str(err)
@@ -55,7 +56,7 @@
 def ai_setup_manifestserv(manifest_obj):
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     """
-        Sets defaults and validates a manifest server object
+        Validates a manifest server object
 
         Args:
 	  manifest_server_obj: ManifestServ object containing data to validate.
@@ -66,9 +67,7 @@
     """
 
     try:
-        manifest_obj.set_defaults()
-        manifest_obj.schema_validate()
-        manifest_obj.semantic_validate()
+        manifest_obj.schema_validate(dtd_schema=True)
         return 0
 
     except StandardError, err: