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

Fix issue where packp3d fails if import.xml is refreshed while contents.xml remains old

Browse Source
This commit is contained in:
rdb 2015-08-06 15:52:02 +02:00
parent b50fbe8263
commit 0c7b65b1fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/p3d/AppRunner.py
View File

@ -471,7 +471,7 @@ class AppRunner(DirectObject):
file.unlink() file.unlink()
return False return False
if not fileSpec.fullVerify(pathname = localPathname): if not fileSpec.fullVerify(pathname = localPathname, notify = self.notify):
# No good after download. # No good after download.
self.notify.info("%s is still no good after downloading." % (url)) self.notify.info("%s is still no good after downloading." % (url))
return False return False

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

@ -3008,10 +3008,10 @@ class Packager:
# environment. # environment.
return None return None
# Make sure we have a fresh version of the contents file.
host = appRunner.getHost(hostUrl) host = appRunner.getHost(hostUrl)
if not host.readContentsFile(): if not host.downloadContentsFile(appRunner.http):
if not host.downloadContentsFile(appRunner.http): return None
return None
packageInfos = [] packageInfos = []
packageInfo = host.getPackage(packageName, version, platform = platform) packageInfo = host.getPackage(packageName, version, platform = platform)