[Python-checkins] python/dist/src/Lib/distutils/command bdist_packager.py,1.3,1.4 bdist_pkgtool.py,1.4,1.5

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv11043/command

Modified Files:
	bdist_packager.py bdist_pkgtool.py 
Log Message:
Fix unused local variables caught by pychecker.

Fixes a bug for Solaris pkgtool (bdist_pkgtool) that would have
prevented it from building subpackages.



Index: bdist_packager.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_packager.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bdist_packager.py	4 Jun 2002 20:14:42 -0000	1.3
--- bdist_packager.py	4 Jun 2002 20:26:44 -0000	1.4
***************
*** 146,150 ****
  
      def initialize_options (self):
-         d = self.distribution
          self.keep_temp = 0
          self.control_only = 0
--- 146,149 ----
***************
*** 188,193 ****
  
          if not self.plat_name:
!             d = self.distribution
!             self.plat = d.get_platforms()
          if self.distribution.has_ext_modules():
              self.plat_name = [sys.platform,]
--- 187,191 ----
  
          if not self.plat_name:
!             self.plat = self.distribution.get_platforms()
          if self.distribution.has_ext_modules():
              self.plat_name = [sys.platform,]
***************
*** 238,247 ****
          log.info("installing to %s", self.pkg_dir)
          self.run_command('install')
- 
-         # And make an archive relative to the root of the
-         # pseudo-installation tree.
-         archive_basename = "%s.%s" % (self.distribution.get_fullname(),
-                                       self.plat_name)
- 
          if not self.keep_temp:
              remove_tree(self.pkg_dir, dry_run=self.dry_run)
--- 236,239 ----

Index: bdist_pkgtool.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_pkgtool.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bdist_pkgtool.py	4 Jun 2002 20:18:24 -0000	1.4
--- bdist_pkgtool.py	4 Jun 2002 20:26:44 -0000	1.5
***************
*** 209,213 ****
              pkg_dir = self.pkg_dir
  
!         install = self.reinitialize_command('install', reinit_subcommands=1)
          # build package
          log.info('Building package')
--- 209,213 ----
              pkg_dir = self.pkg_dir
  
!         self.reinitialize_command('install', reinit_subcommands=1)
          # build package
          log.info('Building package')
***************
*** 276,280 ****
              self.subpackages=string.split(self.subpackages,",")
              for pkg in self.subpackages:
!                 self.make_package(subpackage)
          else:
              self.make_package()
--- 276,280 ----
              self.subpackages=string.split(self.subpackages,",")
              for pkg in self.subpackages:
!                 self.make_package(pkg)
          else:
              self.make_package()