Browse Source

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

rdb 10 years ago
parent
commit
0c7b65b1fd
2 changed files with 4 additions and 4 deletions
  1. 1 1
      direct/src/p3d/AppRunner.py
  2. 3 3
      direct/src/p3d/Packager.py

+ 1 - 1
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

+ 3 - 3
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)