Răsfoiți Sursa

Fix the required module stuff

rdb 15 ani în urmă
părinte
comite
aeb6bef42d
2 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 2 2
      direct/src/p3d/Packager.py
  2. 1 1
      direct/src/p3d/thirdparty.pdef

+ 2 - 2
direct/src/p3d/Packager.py

@@ -536,9 +536,9 @@ class Packager:
             
             
             # But first, make sure that all required modules are present.
             # But first, make sure that all required modules are present.
             missing = []
             missing = []
+            moduleDict = dict(self.freezer.getModuleDefs()).keys()
             for module in self.requiredModules:
             for module in self.requiredModules:
-                if module not in self.freezer.modules.keys() or \
-                            self.freezer.modules[module].exclude:
+                if module not in moduleDict:
                     missing.append(module)
                     missing.append(module)
             if len(missing) > 0:
             if len(missing) > 0:
                 self.notify.warning("Cannot build package %s, missing required modules: %r" % (self.packageName, missing))
                 self.notify.warning("Cannot build package %s, missing required modules: %r" % (self.packageName, missing))

+ 1 - 1
direct/src/p3d/thirdparty.pdef

@@ -98,7 +98,7 @@ class pil(package):
            'TarIO', 'TgaImagePlugin', 'TiffImagePlugin', 'TiffTags',
            'TarIO', 'TgaImagePlugin', 'TiffImagePlugin', 'TiffTags',
            'WalImageFile', 'WmfImagePlugin', 'XVThumbImagePlugin',
            'WalImageFile', 'WmfImagePlugin', 'XVThumbImagePlugin',
            'XbmImagePlugin', 'XpmImagePlugin', '_imaging',
            'XbmImagePlugin', 'XpmImagePlugin', '_imaging',
-           '_imagingmath', '_imagingtk', )
+           '_imagingmath', '_imagingtk')
 
 
 class pyopengl(package):
 class pyopengl(package):
     config(display_name = "PyOpenGL")
     config(display_name = "PyOpenGL")