diff options
| author | Jeremy Hylton <jeremy@alum.mit.edu> | 2002-06-04 20:26:44 (GMT) |
|---|---|---|
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2002-06-04 20:26:44 (GMT) |
| commit | a2f9989c1a5451253d1e6e8508af422363c7e113 (patch) | |
| tree | 01836feb7f7de4b1cf1ee3e5540931afa7911bbe /Lib/distutils/command | |
| parent | a181ec07af8f0ab34d17be777d65935189df5054 (diff) | |
| download | cpython-a2f9989c1a5451253d1e6e8508af422363c7e113.zip cpython-a2f9989c1a5451253d1e6e8508af422363c7e113.tar.gz cpython-a2f9989c1a5451253d1e6e8508af422363c7e113.tar.bz2 | |
Fix unused local variables caught by pychecker.
Fixes a bug for Solaris pkgtool (bdist_pkgtool) that would have
prevented it from building subpackages.
Diffstat (limited to 'Lib/distutils/command')
| -rw-r--r-- | Lib/distutils/command/bdist_packager.py | 10 | ||||
| -rw-r--r-- | Lib/distutils/command/bdist_pkgtool.py | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/Lib/distutils/command/bdist_packager.py b/Lib/distutils/command/bdist_packager.py index 11278ee..dde113c 100644 --- a/Lib/distutils/command/bdist_packager.py +++ b/Lib/distutils/command/bdist_packager.py @@ -145,7 +145,6 @@ class bdist_packager (Command): def initialize_options (self): - d = self.distribution self.keep_temp = 0 self.control_only = 0 self.no_autorelocate = 0 @@ -187,8 +186,7 @@ class bdist_packager (Command): self.pkg_dir = os.path.join(bdist_base, 'binary') if not self.plat_name: - d = self.distribution - self.plat = d.get_platforms() + self.plat = self.distribution.get_platforms() if self.distribution.has_ext_modules(): self.plat_name = [sys.platform,] else: @@ -237,12 +235,6 @@ class bdist_packager (Command): 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) diff --git a/Lib/distutils/command/bdist_pkgtool.py b/Lib/distutils/command/bdist_pkgtool.py index 9d6e7dc..3a48d26 100644 --- a/Lib/distutils/command/bdist_pkgtool.py +++ b/Lib/distutils/command/bdist_pkgtool.py @@ -208,7 +208,7 @@ class bdist_pkgtool (bdist_packager.bdist_packager): else: pkg_dir = self.pkg_dir - install = self.reinitialize_command('install', reinit_subcommands=1) + self.reinitialize_command('install', reinit_subcommands=1) # build package log.info('Building package') self.run_command('build') @@ -275,7 +275,7 @@ class bdist_pkgtool (bdist_packager.bdist_packager): if self.subpackages: self.subpackages=string.split(self.subpackages,",") for pkg in self.subpackages: - self.make_package(subpackage) + self.make_package(pkg) else: self.make_package() # run() |