Browse Source

Changed the lack of dc definition to be a warning

Roger Hughston 18 years ago
parent
commit
2d2f8d7100
1 changed files with 11 additions and 9 deletions
  1. 11 9
      direct/src/distributed/ConnectionRepository.py

+ 11 - 9
direct/src/distributed/ConnectionRepository.py

@@ -170,6 +170,7 @@ class ConnectionRepository(
         dcFileNames is None, reads in all of the dc files listed in
         dcFileNames is None, reads in all of the dc files listed in
         the Configrc file.
         the Configrc file.
         """
         """
+        #import pdb; pdb.set_trace();
         dcFile = self.getDcFile()
         dcFile = self.getDcFile()
         dcFile.clear()
         dcFile.clear()
         self.dclassesByName = {}
         self.dclassesByName = {}
@@ -191,14 +192,14 @@ class ConnectionRepository(
                 if not readResult:
                 if not readResult:
                     self.notify.error("Could not read dc file: %s" % (dcFileName))
                     self.notify.error("Could not read dc file: %s" % (dcFileName))
 
 
-        if not dcFile.allObjectsValid():
-            names = []
-            for i in range(dcFile.getNumTypedefs()):
-                td = dcFile.getTypedef(i)
-                if td.isBogusTypedef():
-                    names.append(td.getName())
-            nameList = ', '.join(names)
-            self.notify.error("Undefined types in DC file: " + nameList)
+        #if not dcFile.allObjectsValid():
+        #    names = []
+        #    for i in range(dcFile.getNumTypedefs()):
+        #        td = dcFile.getTypedef(i)
+        #        if td.isBogusTypedef():
+        #            names.append(td.getName())
+        #    nameList = ', '.join(names)
+        #    self.notify.error("Undefined types in DC file: " + nameList)
 
 
         self.hashVal = dcFile.getHash()
         self.hashVal = dcFile.getHash()
 
 
@@ -255,7 +256,8 @@ class ConnectionRepository(
             else:
             else:
                 if type(classDef) == types.ModuleType:
                 if type(classDef) == types.ModuleType:
                     if not hasattr(classDef, className):
                     if not hasattr(classDef, className):
-                        self.notify.error("Module %s does not define class %s." % (className, className))
+                        self.notify.warning("Module %s does not define class %s." % (className, className))
+                        return
                     classDef = getattr(classDef, className)
                     classDef = getattr(classDef, className)
 
 
                 if type(classDef) != types.ClassType and type(classDef) != types.TypeType:
                 if type(classDef) != types.ClassType and type(classDef) != types.TypeType: