[Python-checkins] python/dist/src/Lib/plat-mac pimp.py,1.26,1.27

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Mon, 21 Jul 2003 13:47:13 -0700


Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv32743

Modified Files:
	pimp.py 
Log Message:
Backport from r23c1-branch:
Pimp crashed if you tried to install a non-installable package, in stead
of printing a decent error message. Fixes #773450..



Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** pimp.py	29 Jun 2003 00:09:18 -0000	1.26
--- pimp.py	21 Jul 2003 20:47:11 -0000	1.27
***************
*** 586,591 ****
          will receive a log of what happened."""
          
!         if not self._dict['Download-URL']:
!             return "%s: This package needs to be installed manually (no Download-URL field)" % _fmtpackagename(self)
          msg = self.downloadPackageOnly(output)
          if msg:
--- 586,591 ----
          will receive a log of what happened."""
          
!         if not self._dict.get('Download-URL'):
!             return "%s: This package needs to be installed manually (no Download-URL field)" % self.fullname()
          msg = self.downloadPackageOnly(output)
          if msg: