Commit 3a8d4728 authored by Jason R. Coombs's avatar Jason R. Coombs

Extract method for fixing install dir

parent 12616142
...@@ -237,15 +237,7 @@ class easy_install(Command): ...@@ -237,15 +237,7 @@ class easy_install(Command):
self.config_vars['userbase'] = self.install_userbase self.config_vars['userbase'] = self.install_userbase
self.config_vars['usersite'] = self.install_usersite self.config_vars['usersite'] = self.install_usersite
# fix the install_dir if "--user" was used self._fix_install_dir_for_user_site()
if self.user and site.ENABLE_USER_SITE:
self.create_home_path()
if self.install_userbase is None:
raise DistutilsPlatformError(
"User base directory is not specified")
self.install_base = self.install_platbase = self.install_userbase
scheme_name = os.name.replace('posix', 'unix') + '_user'
self.select_scheme(scheme_name)
self.expand_basedirs() self.expand_basedirs()
self.expand_dirs() self.expand_dirs()
...@@ -340,6 +332,19 @@ class easy_install(Command): ...@@ -340,6 +332,19 @@ class easy_install(Command):
self.outputs = [] self.outputs = []
def _fix_install_dir_for_user_site(self):
"""
Fix the install_dir if "--user" was used.
"""
if self.user and site.ENABLE_USER_SITE:
self.create_home_path()
if self.install_userbase is None:
raise DistutilsPlatformError(
"User base directory is not specified")
self.install_base = self.install_platbase = self.install_userbase
scheme_name = os.name.replace('posix', 'unix') + '_user'
self.select_scheme(scheme_name)
def _expand_attrs(self, attrs): def _expand_attrs(self, attrs):
for attr in attrs: for attr in attrs:
val = getattr(self, attr) val = getattr(self, attr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment