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

[jackjansen@users.sourceforge.net]

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

Modified Files:
	pimp.py 
Log Message:
When doing a forced install of a package depending on a pseudo-package
you got a strange error message. Fixed.


Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pimp.py	2 May 2003 20:27:40 -0000	1.19
--- pimp.py	6 May 2003 12:44:00 -0000	1.20
***************
*** 133,137 ****
              names = [member.name for member in skip if member.name[-1] != '/']
              if names:
! 	            return "Not all files were unpacked: %s" % " ".join(names)
          
  ARCHIVE_FORMATS = [
--- 133,137 ----
              names = [member.name for member in skip if member.name[-1] != '/']
              if names:
!                 return "Not all files were unpacked: %s" % " ".join(names)
          
  ARCHIVE_FORMATS = [
***************
*** 469,472 ****
--- 469,477 ----
          rv = []
          if not self._dict.get('Download-URL'):
+             # For pseudo-packages that are already installed we don't
+             # return an error message
+             status, _  = self.installed()
+             if status == "yes":
+                 return []
              return [(None, 
                  "%s: This package cannot be installed automatically (no Download-URL field)" %