Merge pull request #1080 from qwcode/global_build_dir

fixes for #1078

Author: jezdez

pip/cmdoptions.py

@@ -141,7 +141,7 @@ def make_option_group(group, parser):
     default=build_prefix,
     help='Directory to unpack packages into and build in. '
     'The default in a virtualenv is "<venv path>/build". '
-    'The default for global installs is "<OS temp dir>/pip-build-<username>".')
+    'The default for global installs is "<OS temp dir>/pip_build_<username>".')
 
 install_options = make_option(
     '--install-option',

pip/commands/install.py

@@ -7,7 +7,7 @@
 from pip.locations import src_prefix, virtualenv_no_global, distutils_scheme
 from pip.basecommand import Command
 from pip.index import PackageFinder
-from pip.exceptions import InstallationError, CommandError
+from pip.exceptions import InstallationError, CommandError, PreviousBuildDirError
 from pip import cmdoptions
 
 
@@ -251,6 +251,8 @@ def run(self, options, args):
             elif self.bundle:
                 requirement_set.create_bundle(self.bundle_filename)
                 logger.notify('Created bundle in %s' % self.bundle_filename)
+        except PreviousBuildDirError:
+            return
         finally:
             # Clean up
             if (not options.no_clean) and ((not options.no_install) or options.download_dir):

pip/commands/wheel.py

@@ -6,7 +6,7 @@
 from pip.basecommand import Command
 from pip.index import PackageFinder
 from pip.log import logger
-from pip.exceptions import CommandError
+from pip.exceptions import CommandError, PreviousBuildDirError
 from pip.req import InstallRequirement, RequirementSet, parse_requirements
 from pip.util import normalize_path
 from pip.wheel import WheelBuilder, wheel_setuptools_support, setuptools_requirement
@@ -150,6 +150,8 @@ def run(self, options, args):
                 global_options = options.global_options or []
                 )
             wb.build()
+        except PreviousBuildDirError:
+            return
         finally:
             if not options.no_clean:
                 requirement_set.cleanup_files()

pip/locations.py

@@ -57,7 +57,7 @@ def __get_username():
 
 def _get_build_prefix():
     """ Returns a safe build_prefix """
-    path = os.path.join(tempfile.gettempdir(), 'pip-build-%s' %
+    path = os.path.join(tempfile.gettempdir(), 'pip_build_%s' %
         __get_username())
     if sys.platform == 'win32':
         """ on windows(tested on 7) temp dirs are isolated """

tests/functional/test_install_cleanup.py

@@ -131,3 +131,15 @@ def test_cleanup_after_egg_info_exception():
     build = env.venv_path/'build'
     assert not exists(build), "build/ dir still exists: %s" % result.stdout
     env.assert_no_temp()
+
+def test_cleanup_prevented_upon_build_dir_exception():
+    """
+    Test no cleanup occurs after a PreviousBuildDirError
+    """
+    env = reset_env()
+    build = env.venv_path/'build'/'simple'
+    os.makedirs(build)
+    write_file("setup.py", "#", dest=build)
+    result = run_pip('install', '-f', find_links, '--no-index', 'simple', expect_error=True)
+    assert "pip can't proceed" in result.stdout, result.stdout
+    assert exists(build)

tests/unit/test_locations.py

@@ -78,7 +78,7 @@ def get_build_dir_location(self):
         """ returns a string pointing to the
             current build_prefix.
         """
-        return os.path.join(self.tempdir, 'pip-build-%s' % self.username)
+        return os.path.join(self.tempdir, 'pip_build_%s' % self.username)
 
     def test_dir_path(self):
         """ test the path name for the build_prefix