Sfoglia il codice sorgente

fix python subdirectory issue

David Rose 16 anni fa
parent
commit
d18f226684
2 ha cambiato i file con 3 aggiunte e 2 eliminazioni
  1. 1 1
      direct/src/p3d/AppRunner.py
  2. 2 1
      direct/src/p3d/Packager.py

+ 1 - 1
direct/src/p3d/AppRunner.py

@@ -677,7 +677,7 @@ class AppRunner(DirectObject):
 
         self.initPackedAppEnvironment()
 
-        # Mount the Multifile under /mf, by convention.
+        # Mount the Multifile under self.multifileRoot.
         vfs.mount(mf, self.multifileRoot, vfs.MFReadOnly)
         VFSImporter.reloadSharedPackages()
 

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

@@ -1472,6 +1472,7 @@ class Packager:
 
             filename = file.newName.rsplit('.', 1)[0]
             moduleName = filename.replace("/", ".")
+            newName = moduleName
             if moduleName.endswith('.__init__'):
                 moduleName = moduleName.rsplit('.', 1)[0]
 
@@ -1480,7 +1481,7 @@ class Packager:
                 # deal with it again.
                 return
 
-            self.freezer.addModule(moduleName, newName = moduleName,
+            self.freezer.addModule(moduleName, newName = newName,
                                    filename = file.filename)
 
         def addEggFile(self, file):