From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 21 Jul 2003 22:11:07 +0000 (+0000)
Subject: We erronuously re-used the pimpinstaller object if there were multiple installs.
X-Git-Tag: v2.3c2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40b2e839246aa74f08eea1c2abb60e5ca93ecab0;p=python

We erronuously re-used the pimpinstaller object if there were multiple installs.
This lead to a duplication of error messages (and installs). Fixes #764615.
---

diff --git a/Mac/Tools/IDE/PackageManager.py b/Mac/Tools/IDE/PackageManager.py
index 27cd2398f1..2b27ac0993 100755
--- a/Mac/Tools/IDE/PackageManager.py
+++ b/Mac/Tools/IDE/PackageManager.py
@@ -244,7 +244,6 @@ class PimpInterface:
 	def setuppimp(self, url):
 		self.pimpprefs = pimp.PimpPreferences()
 		self.pimpdb = pimp.PimpDatabase(self.pimpprefs)
-		self.pimpinstaller = pimp.PimpInstaller(self.pimpdb)
 		if not url:
 			url = self.pimpprefs.pimpDatabase
 		try:
@@ -271,7 +270,6 @@ class PimpInterface:
 		self.pimpdb.close()
 		self.pimpprefs = None
 		self.pimpdb = None
-		self.pimpinstaller = None
 		self.packages = []
 
 	def setuserinstall(self, onoff):
@@ -320,10 +318,11 @@ class PimpInterface:
 		
 	def installpackage(self, sel, output, recursive, force):
 		pkg = self.packages[sel]
-		list, messages = self.pimpinstaller.prepareInstall(pkg, force, recursive)
+		pimpinstaller = pimp.PimpInstaller(self.pimpdb)
+		list, messages = pimpinstaller.prepareInstall(pkg, force, recursive)
 		if messages:
 			return messages
-		messages = self.pimpinstaller.install(list, output)
+		messages = pimpinstaller.install(list, output)
 		return messages
 			
 class PackageBrowser(PimpInterface):