Explorar o código

minor bugfixes

David Rose %!s(int64=15) %!d(string=hai) anos
pai
achega
599e8eff89
Modificáronse 3 ficheiros con 5 adicións e 5 borrados
  1. 1 1
      direct/src/p3d/AppRunner.py
  2. 1 1
      direct/src/p3d/HostInfo.py
  3. 3 3
      direct/src/plugin/Sources.pp

+ 1 - 1
direct/src/p3d/AppRunner.py

@@ -584,7 +584,7 @@ class AppRunner(DirectObject):
             else:
             else:
                 # If it's an unknown package, just delete it directly.
                 # If it's an unknown package, just delete it directly.
                 print "Deleting unknown package %s" % (packageData.pathname)
                 print "Deleting unknown package %s" % (packageData.pathname)
-                self.rmtree(packageData.pathname())
+                self.rmtree(packageData.pathname)
 
 
         packages = self.deletePackages(packages)
         packages = self.deletePackages(packages)
         if packages:
         if packages:

+ 1 - 1
direct/src/p3d/HostInfo.py

@@ -74,7 +74,7 @@ class HostInfo:
         """ Assigns self.hostUrl, and related values. """
         """ Assigns self.hostUrl, and related values. """
         self.hostUrl = hostUrl
         self.hostUrl = hostUrl
 
 
-        if self.hostUrl is None:
+        if not self.hostUrl:
             # A special case: the URL will be set later.
             # A special case: the URL will be set later.
             self.hostUrlPrefix = None
             self.hostUrlPrefix = None
             self.downloadUrlPrefix = None
             self.downloadUrlPrefix = None

+ 3 - 3
direct/src/plugin/Sources.pp

@@ -220,7 +220,7 @@
 // to invoke a particular instance of Panda.
 // to invoke a particular instance of Panda.
 //
 //
 
 
-  #define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
+  #define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
   #define USE_PACKAGES tinyxml python openssl cg
   #define USE_PACKAGES tinyxml python openssl cg
   #define TARGET p3dpython
   #define TARGET p3dpython
 
 
@@ -268,7 +268,7 @@
 // the desktop.)
 // the desktop.)
 //
 //
 
 
-  #define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL],$[WINDOWS_PLATFORM]]
+  #define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL],$[WINDOWS_PLATFORM]]
   #define USE_PACKAGES tinyxml python openssl
   #define USE_PACKAGES tinyxml python openssl
   #define TARGET p3dpythonw
   #define TARGET p3dpythonw
   #define EXTRA_CDEFS NON_CONSOLE
   #define EXTRA_CDEFS NON_CONSOLE
@@ -314,7 +314,7 @@
 // desparation fallback in case forking fails for some reason.
 // desparation fallback in case forking fails for some reason.
 //
 //
 
 
-  #define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
+  #define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
   #define USE_PACKAGES tinyxml python openssl cg
   #define USE_PACKAGES tinyxml python openssl cg
   #define TARGET libp3dpython
   #define TARGET libp3dpython
   #define LIB_PREFIX
   #define LIB_PREFIX