From 947faa7e6873457b36aaae084a453b1c83d375d3 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 12 Mar 2012 09:24:09 +0000 Subject: [PATCH] oops, don't reuse amd64 binaries for i386 (and vice versa). fixes LP #949090 --- direct/src/p3d/DeploymentTools.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/direct/src/p3d/DeploymentTools.py b/direct/src/p3d/DeploymentTools.py index 35db155c28..084dd18e4e 100644 --- a/direct/src/p3d/DeploymentTools.py +++ b/direct/src/p3d/DeploymentTools.py @@ -478,7 +478,7 @@ class Installer: self.standalone = Standalone(p3dfile, tokens) self.tempDir = Filename.temporary("", self.shortname, "") + "/" self.tempDir.makeDir() - self.__linuxRoot = None + self.__tempRoots = {} # Load the p3d file to read out the required packages mf = Multifile() @@ -642,8 +642,8 @@ class Installer: """ Builds a filesystem for Linux. Used so that buildDEB, buildRPM and buildArch can share the same temp directory. """ - if self.__linuxRoot is not None: - return self.__linuxRoot + if platform in self.__tempRoots: + return self.__tempRoots[platform] tempdir = Filename(self.tempDir, platform) tempdir.makeDir() @@ -712,8 +712,8 @@ class Installer: for name in files: totsize += os.path.getsize(os.path.join(root, name)) - self.__linuxRoot = (tempdir, totsize) - return self.__linuxRoot + self.__tempRoots[platform] = (tempdir, totsize) + return self.__tempRoots[platform] def buildDEB(self, output, platform): """ Builds a .deb archive and stores it in the path indicated