From 26bcccbf56c7ef8aee5bf6fe3d3c34bf9ed76526 Mon Sep 17 00:00:00 2001 From: Frankie Dintino Date: Tue, 20 Nov 2012 09:46:51 -0500 Subject: [PATCH] Removes redundant `upgrade=(upgrade or upgrade_recursive)`. refs #304 --- pip/commands/install.py | 6 ++++-- pip/req.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pip/commands/install.py b/pip/commands/install.py index 09ce935933f..1e9cbe1c8fa 100644 --- a/pip/commands/install.py +++ b/pip/commands/install.py @@ -221,19 +221,21 @@ def run(self, options, args): finder = self._build_package_finder(options, index_urls) + upgrade = options.upgrade or options.upgrade_recursive + requirement_set = RequirementSet( build_dir=options.build_dir, src_dir=options.src_dir, download_dir=options.download_dir, download_cache=options.download_cache, - upgrade=options.upgrade or options.upgrade_recursive, + upgrade=upgrade, upgrade_recursive=options.upgrade_recursive, as_egg=options.as_egg, ignore_installed=options.ignore_installed, ignore_dependencies=options.ignore_dependencies, force_reinstall=options.force_reinstall, use_user_site=options.use_user_site) - upgrade = options.upgrade or options.upgrade_recursive + for name in args: requirement_set.add_requirement( InstallRequirement.from_line(name, None, upgrade=upgrade)) diff --git a/pip/req.py b/pip/req.py index 898c61584fe..2dfce5e167f 100644 --- a/pip/req.py +++ b/pip/req.py @@ -820,7 +820,7 @@ def __init__(self, build_dir, src_dir, download_dir, download_cache=None, self.src_dir = src_dir self.download_dir = download_dir self.download_cache = download_cache - self.upgrade = upgrade or upgrade_recursive + self.upgrade = upgrade self.upgrade_recursive = upgrade_recursive self.ignore_installed = ignore_installed self.force_reinstall = force_reinstall