From 9f13f5334cc96964d3404b9cb2516134b1fab521 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 2 Dec 2009 15:51:42 +0000 Subject: [PATCH] fix additional problem with -r --- direct/src/p3d/Packager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/direct/src/p3d/Packager.py b/direct/src/p3d/Packager.py index b415f109d8..11b1acd302 100644 --- a/direct/src/p3d/Packager.py +++ b/direct/src/p3d/Packager.py @@ -2186,7 +2186,9 @@ class Packager: if not package: # 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: package = self.packages.setdefault((package.packageName, package.platform, package.version, package.host), package) @@ -2268,7 +2270,7 @@ class Packager: return None 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. packages = host.getPackages(packageName, platform = platform) self.__sortPackageInfos(packages)