TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix additional problem with -r

Browse Source
This commit is contained in:
David Rose 2009-12-02 15:51:42 +00:00
parent f28a01b52b
commit 9f13f5334c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2186,7 +2186,9 @@ class Packager:
if not package: if not package:
# Query the indicated host. # Query the indicated host.
package = self.__findPackageOnHost(packageName, platform, version, host, requires = requires) package = self.__findPackageOnHost(packageName, platform or self.platform, version or None, host, requires = requires)
if not package:
package = self.__findPackageOnHost(packageName, platform, version, host, requires = requires)
if package: if package:
package = self.packages.setdefault((package.packageName, package.platform, package.version, package.host), package) package = self.packages.setdefault((package.packageName, package.platform, package.version, package.host), package)
@ -2268,7 +2270,7 @@ class Packager:
return None return None
package = host.getPackage(packageName, version, platform = platform) package = host.getPackage(packageName, version, platform = platform)
if not package and version is None: if not package and not version:
# With no version specified, find the best matching version. # With no version specified, find the best matching version.
packages = host.getPackages(packageName, platform = platform) packages = host.getPackages(packageName, platform = platform)
self.__sortPackageInfos(packages) self.__sortPackageInfos(packages)