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

let pdeploy respect the super-mirror

Browse Source
This commit is contained in:
rdb 2010-11-13 14:57:00 +00:00
parent abbf78d725
commit 5541054c0f
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
direct/src/p3d/DeploymentTools.py
View File

@ -212,11 +212,24 @@ class Installer:
if not host.hasContentsFile: if not host.hasContentsFile:
if not host.readContentsFile(): if not host.readContentsFile():
if not host.downloadContentsFile(self.http): if not host.downloadContentsFile(self.http):
Installer.notify.error("couldn't read host") Installer.notify.error("couldn't read host %s" % host.hostUrl)
return return
superHost = None
if appRunner.superMirrorUrl:
superHost = HostInfo(appRunner.superMirrorUrl, appRunner = appRunner, hostDir = hostDir, asMirror = False, perPlatform = False)
if not superHost.hasContentsFile:
if not superHost.readContentsFile():
if not superHost.downloadContentsFile(self.http):
Installer.notify.warning("couldn't read supermirror host %s" % superHost.hostUrl)
superHost = None
for name, version in self.requirements: for name, version in self.requirements:
package = host.getPackage(name, version, platform) package = None
if superHost:
package = superHost.getPackage(name, version, platform)
if not package:
package = host.getPackage(name, version, platform)
if not package: if not package:
Installer.notify.error("Package %s %s for %s not known on %s" % ( Installer.notify.error("Package %s %s for %s not known on %s" % (
name, version, platform, host.hostUrl)) name, version, platform, host.hostUrl))
@ -231,14 +244,15 @@ class Installer:
continue continue
# Also install the 'images' package from the same host that p3dembed was downloaded from. # Also install the 'images' package from the same host that p3dembed was downloaded from.
host = HostInfo(self.standalone.host.hostUrl, appRunner = appRunner, hostDir = hostDir, asMirror = False, perPlatform = False) if host.hostUrl != self.standalone.host.hostUrl:
if not host.hasContentsFile: host = HostInfo(self.standalone.host.hostUrl, appRunner = appRunner, hostDir = hostDir, asMirror = False, perPlatform = False)
if not host.readContentsFile(): if not host.hasContentsFile:
if not host.downloadContentsFile(self.http): if not host.readContentsFile():
Installer.notify.error("couldn't read host") if not host.downloadContentsFile(self.http):
return Installer.notify.error("couldn't read host %s" % host.hostUrl)
return
for package in host.getPackages(name = "images"): for package in superHost.getPackages(name = "images") + host.getPackages(name = "images"):
package.installed = True # Hack not to let it unnecessarily install itself package.installed = True # Hack not to let it unnecessarily install itself
packages.append(package) packages.append(package)
if not package.downloadDescFile(self.http): if not package.downloadDescFile(self.http):