TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove annoying ":Packager(warning): No such file" warning

Browse Source
This commit is contained in:
rdb 2015-11-23 20:20:48 +01:00
parent 5580f1919e
commit e6b245c56d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
direct/src/p3d/Packager.py
View File

@ -3764,8 +3764,7 @@ class Packager:
self.__recurseDir(dirname, newDir, unprocessed = unprocessed) self.__recurseDir(dirname, newDir, unprocessed = unprocessed)
def __recurseDir(self, filename, newName, unprocessed = None, packageTree = None): def __recurseDir(self, filename, newName, unprocessed = None, packageTree = None):
dirList = vfs.scanDirectory(filename) if filename.isDirectory():
if dirList:
# It's a directory name. Recurse. # It's a directory name. Recurse.
prefix = newName prefix = newName
if prefix and prefix[-1] != '/': if prefix and prefix[-1] != '/':
@ -3773,6 +3772,7 @@ class Packager:
# First check if this is a Python package tree. If so, add it # First check if this is a Python package tree. If so, add it
# implicitly as a module. # implicitly as a module.
dirList = vfs.scanDirectory(filename)
for subfile in dirList: for subfile in dirList:
filename = subfile.getFilename() filename = subfile.getFilename()
if filename.getBasename() == '__init__.py': if filename.getBasename() == '__init__.py':
@ -3784,6 +3784,9 @@ class Packager:
self.__recurseDir(filename, prefix + filename.getBasename(), self.__recurseDir(filename, prefix + filename.getBasename(),
unprocessed = unprocessed) unprocessed = unprocessed)
return return
elif not filename.exists():
# It doesn't exist. Perhaps it's a virtual file. Ignore it.
return
# It's a file name. Add it. # It's a file name. Add it.
ext = filename.getExtension() ext = filename.getExtension()

1
doc/ReleaseNotes
View File

@ -49,6 +49,7 @@ Fixes and improvements for the runtime:
* Fix missing xml and ast modules from morepy package * Fix missing xml and ast modules from morepy package
* Certificate dialog is now localized to various languages * Certificate dialog is now localized to various languages
* Pass on failing exit status from packaged application * Pass on failing exit status from packaged application
* Remove annoying ":Packager(warning): No such file" warning
* Fix issue installing pdeploy-generated .pkg on OS X 10.11 * Fix issue installing pdeploy-generated .pkg on OS X 10.11
Fixes for the Python API: Fixes for the Python API: