From 0c7b65b1fd943ff4314281ab3b35a77376843859 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 6 Aug 2015 15:52:02 +0200 Subject: [PATCH] Fix issue where packp3d fails if import.xml is refreshed while contents.xml remains old --- direct/src/p3d/AppRunner.py | 2 +- direct/src/p3d/Packager.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/direct/src/p3d/AppRunner.py b/direct/src/p3d/AppRunner.py index b9a1f17572..ff63e5aa8d 100644 --- a/direct/src/p3d/AppRunner.py +++ b/direct/src/p3d/AppRunner.py @@ -471,7 +471,7 @@ class AppRunner(DirectObject): file.unlink() return False - if not fileSpec.fullVerify(pathname = localPathname): + if not fileSpec.fullVerify(pathname = localPathname, notify = self.notify): # No good after download. self.notify.info("%s is still no good after downloading." % (url)) return False diff --git a/direct/src/p3d/Packager.py b/direct/src/p3d/Packager.py index d2166ec4f8..84448e23a7 100644 --- a/direct/src/p3d/Packager.py +++ b/direct/src/p3d/Packager.py @@ -3008,10 +3008,10 @@ class Packager: # environment. return None + # Make sure we have a fresh version of the contents file. host = appRunner.getHost(hostUrl) - if not host.readContentsFile(): - if not host.downloadContentsFile(appRunner.http): - return None + if not host.downloadContentsFile(appRunner.http): + return None packageInfos = [] packageInfo = host.getPackage(packageName, version, platform = platform)