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

[jackjansen@users.sourceforge.net]

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

Modified Files:
	pimp.py 
Log Message:
- Added support for zip archives
- Better messages in case of a crash of the install-test script


Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pimp.py	16 Feb 2003 23:03:04 -0000	1.11
--- pimp.py	17 Feb 2003 12:21:05 -0000	1.12
***************
*** 47,50 ****
--- 47,51 ----
  	(".tgz", "zcat \"%s\" | tar -xf -"),
  	(".tar.bz", "bzcat \"%s\" | tar -xf -"),
+ 	(".zip", "unzip \"%s\""),
  ]
  
***************
*** 344,347 ****
--- 345,358 ----
  			return "bad", str(arg)
  		except:
+ 			sys.stderr.write("-------------------------------------\n")
+ 			sys.stderr.write("---- %s: install test got exception\n" % self.fullname())
+ 			sys.stderr.write("---- source:\n")
+ 			sys.stderr.write(installTest)
+ 			sys.stderr.write("---- exception:\n")
+ 			import traceback
+ 			traceback.print_exc(file=sys.stderr)
+ 			if self._db._maintainer:
+ 				sys.stderr.write("---- Please copy this and mail to %s\n" % self._db._maintainer)
+ 			sys.stderr.write("-------------------------------------\n")
  			return "bad", "Package install test got exception"
  		return "yes", ""
***************
*** 541,548 ****
  			return "unknown extension for archive file: %s" % filename
  		
! 		# Modify where the files are extracted
! 		prefixmod = '-C /'
  		cmd = cmd % self.archiveFilename
! 		if self._cmd(output, self._db.preferences.buildDir, cmd, prefixmod):
  			return "unpack command failed"
  		
--- 552,558 ----
  			return "unknown extension for archive file: %s" % filename
  		
! 		# Extract the files in the root folder.
  		cmd = cmd % self.archiveFilename
! 		if self._cmd(output, "/", cmd):
  			return "unpack command failed"