[Python-checkins] python/dist/src/Mac/Tools/IDE PackageManager.py,1.13,1.14
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Mon, 21 Jul 2003 15:11:10 -0700
Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory sc8-pr-cvs1:/tmp/cvs-serv20026
Modified Files:
PackageManager.py
Log Message:
We erronuously re-used the pimpinstaller object if there were multiple installs.
This lead to a duplication of error messages (and installs). Fixes #764615.
Index: PackageManager.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PackageManager.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PackageManager.py 21 Jul 2003 22:03:14 -0000 1.13
--- PackageManager.py 21 Jul 2003 22:11:07 -0000 1.14
***************
*** 245,249 ****
self.pimpprefs = pimp.PimpPreferences()
self.pimpdb = pimp.PimpDatabase(self.pimpprefs)
- self.pimpinstaller = pimp.PimpInstaller(self.pimpdb)
if not url:
url = self.pimpprefs.pimpDatabase
--- 245,248 ----
***************
*** 272,276 ****
self.pimpprefs = None
self.pimpdb = None
- self.pimpinstaller = None
self.packages = []
--- 271,274 ----
***************
*** 321,328 ****
def installpackage(self, sel, output, recursive, force):
pkg = self.packages[sel]
! list, messages = self.pimpinstaller.prepareInstall(pkg, force, recursive)
if messages:
return messages
! messages = self.pimpinstaller.install(list, output)
return messages
--- 319,327 ----
def installpackage(self, sel, output, recursive, force):
pkg = self.packages[sel]
! pimpinstaller = pimp.PimpInstaller(self.pimpdb)
! list, messages = pimpinstaller.prepareInstall(pkg, force, recursive)
if messages:
return messages
! messages = pimpinstaller.install(list, output)
return messages