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

2003年2月16日 15:03:10 -0800

Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv23814
Modified Files:
	pimp.py 
Log Message:
Better error messages and warnings.
Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pimp.py	14 Feb 2003 14:11:59 -0000	1.10
--- pimp.py	16 Feb 2003 23:03:04 -0000	1.11
***************
*** 358,362 ****
 		rv = []
 		if not self._dict.get('Download-URL'):
! 			return [(None, "This package needs to be installed manually")]
 		if not self._dict.get('Prerequisites'):
 			return []
--- 358,364 ----
 		rv = []
 		if not self._dict.get('Download-URL'):
! 			return [(None, 
! 				"%s: This package needs to be installed manually (no Download-URL field)" %
! 					self.fullname())]
 		if not self._dict.get('Prerequisites'):
 			return []
***************
*** 448,452 ****
 		else:
 			return "unknown extension for archive file: %s" % filename
! 		basename = filename[:-len(ext)]
 		cmd = cmd % self.archiveFilename
 		if self._cmd(output, self._db.preferences.buildDir, cmd):
--- 450,454 ----
 		else:
 			return "unknown extension for archive file: %s" % filename
! 		self.basename = filename[:-len(ext)]
 		cmd = cmd % self.archiveFilename
 		if self._cmd(output, self._db.preferences.buildDir, cmd):
***************
*** 455,459 ****
 	def installPackageOnly(self, output=None):
 		"""Default install method, to be overridden by subclasses"""
! 		return "Cannot automatically install package %s" % self.fullname()

 	def installSinglePackage(self, output=None):
--- 457,462 ----
 	def installPackageOnly(self, output=None):
 		"""Default install method, to be overridden by subclasses"""
! 		return "%s: This package needs to be installed manually (no support for flavor=\"%s\")" \
! 			% (self.fullname(), self._dict.get(flavor, ""))

 	def installSinglePackage(self, output=None):
***************
*** 464,475 ****

 		if not self._dict['Download-URL']:
! 			return "%s: This package needs to be installed manually" % _fmtpackagename(self)
 		msg = self.downloadPackageOnly(output)
 		if msg:
! 			return "download %s: %s" % (self.fullname(), msg)

 		msg = self.unpackPackageOnly(output)
 		if msg:
! 			return "unpack %s: %s" % (self.fullname(), msg)

 		return self.installPackageOnly(output)
--- 467,478 ----

 		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:
! 			return "%s: download: %s" % (self.fullname(), msg)

 		msg = self.unpackPackageOnly(output)
 		if msg:
! 			return "%s: unpack: %s" % (self.fullname(), msg)

 		return self.installPackageOnly(output)
***************
*** 518,521 ****
--- 521,525 ----
 		If output is given it should be a file-like object and it
 		will receive a log of what happened."""
+ 		print 'PimpPackage_binary installPackageOnly'

 		msgs = []
***************
*** 558,562 ****
 		PimpPackage.unpackPackageOnly(self, output)
 		# Test that a setup script has been create
! 		self._buildDirname = os.path.join(self._db.preferences.buildDir, basename)
 		setupname = os.path.join(self._buildDirname, "setup.py")
 		if not os.path.exists(setupname) and not NO_EXECUTE:
--- 562,566 ----
 		PimpPackage.unpackPackageOnly(self, output)
 		# Test that a setup script has been create
! 		self._buildDirname = os.path.join(self._db.preferences.buildDir, self.basename)
 		setupname = os.path.join(self._buildDirname, "setup.py")
 		if not os.path.exists(setupname) and not NO_EXECUTE: