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

[jackjansen@users.sourceforge.net]

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

Modified Files:
	pimp.py 
Log Message:
Allow switching of install dir after creation of preferences.
Changed some message to be clearer when presented by Package Manager.


Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pimp.py	15 Apr 2003 14:43:05 -0000	1.16
--- pimp.py	16 Apr 2003 12:15:34 -0000	1.17
***************
*** 161,164 ****
--- 161,171 ----
          if not pimpDatabase:
              pimpDatabase = DEFAULT_PIMPDATABASE
+         self.setInstallDir(installDir)
+         self.flavorOrder = flavorOrder
+         self.downloadDir = downloadDir
+         self.buildDir = buildDir
+         self.pimpDatabase = pimpDatabase
+         
+     def setInstallDir(self, installDir=None):
          if installDir:
              # Installing to non-standard location.
***************
*** 171,180 ****
              installDir = DEFAULT_INSTALLDIR
              self.installLocations = []
-         self.flavorOrder = flavorOrder
-         self.downloadDir = downloadDir
-         self.buildDir = buildDir
          self.installDir = installDir
!         self.pimpDatabase = pimpDatabase
!         
      def check(self):
          """Check that the preferences make sense: directories exist and are
--- 178,183 ----
              installDir = DEFAULT_INSTALLDIR
              self.installLocations = []
          self.installDir = installDir
! 
      def check(self):
          """Check that the preferences make sense: directories exist and are
***************
*** 466,470 ****
          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'):
--- 469,473 ----
          if not self._dict.get('Download-URL'):
              return [(None, 
!                 "%s: This package cannot be installed automatically (no Download-URL field)" %
                      self.fullname())]
          if not self._dict.get('Prerequisites'):
***************
*** 756,760 ****
                  self._prepareInstall(pkg, force, recursive)
              else:
!                 self._curmessages.append("Requires: %s" % descr)
                  
      def prepareInstall(self, package, force=0, recursive=1):
--- 759,763 ----
                  self._prepareInstall(pkg, force, recursive)
              else:
!                 self._curmessages.append("Problem with dependency: %s" % descr)
                  
      def prepareInstall(self, package, force=0, recursive=1):