From 1ca48aefcfa45e4b852a789ca94c9e5b0b985c2e Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sat, 13 Nov 2010 16:16:23 +0000
Subject: [PATCH] Found those darn issues, and fixed them

---
 direct/src/p3d/DeploymentTools.py | 2 +-
 direct/src/p3d/Packager.py        | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/direct/src/p3d/DeploymentTools.py b/direct/src/p3d/DeploymentTools.py
index bccd9fc5d7..faa313d16b 100644
--- a/direct/src/p3d/DeploymentTools.py
+++ b/direct/src/p3d/DeploymentTools.py
@@ -147,7 +147,7 @@ class Standalone:
         filenames = []
         vfs = VirtualFileSystem.getGlobalPtr()
         for e in package.extracts:
-            if e.basename not in ["p3dembed", "p3dembed.exe"]:
+            if e.basename not in ["p3dembed", "p3dembed.exe", "p3dembed.exe.manifest"]:
                 filename = Filename(package.getPackageDir(), e.filename)
                 filename.makeAbsolute()
                 if vfs.exists(filename):
diff --git a/direct/src/p3d/Packager.py b/direct/src/p3d/Packager.py
index 11115fed98..6b3975bf4c 100644
--- a/direct/src/p3d/Packager.py
+++ b/direct/src/p3d/Packager.py
@@ -895,18 +895,15 @@ class Packager:
                     command = 'mt -inputresource:"%s";#%d -out:"%s" > nul' % (
                         file.filename.toOsSpecific(),
                         resindex, tempFile.toOsSpecific())
-                    print command
                     try:
                         out = os.system(command)
                     except:
-                        print "failed"
                         pass
                     afilenames = None
 
                     if tempFile.exists():
                         afilenames = self.__parseManifest(tempFile)
-                        print tempFile
-                        #tempFile.unlink()
+                        tempFile.unlink()
 
                     # Also check for an explicit private-assembly
                     # manifest file on disk.
@@ -999,7 +996,7 @@ class Packager:
             while dependency:
                 depassembly = dependency.FirstChildElement("dependentAssembly")
                 if depassembly:
-                    ident = assembly.FirstChildElement("assemblyIdentity")
+                    ident = depassembly.FirstChildElement("assemblyIdentity")
                     if ident:
                         name = ident.Attribute("name")
                         if name: