@@ -688,26 +688,23 @@ def decide_user_install(
688
688
# (mismatch between user or group id and effective id)
689
689
# or by an administrator.
690
690
if use_user_site is not None :
691
+ # use_user_site might be passed as an int.
691
692
use_user_site = bool (use_user_site )
692
693
if use_user_site :
693
694
logger .debug ("User install by explicit request" )
694
695
else :
695
696
logger .debug ("Non-user install by explicit request" )
696
697
if use_user_site and ENABLE_USER_SITE is None :
697
698
raise InstallationError (
698
- "User site-packages are disabled "
699
- "for security reasons or by an administrator."
699
+ "User site-packages cannot be used because "
700
+ "site.ENABLE_USER_SITE is None, which indicates "
701
+ "it was disabled for security reasons or by an administrator."
700
702
)
701
- elif ENABLE_USER_SITE is None :
703
+ elif not ENABLE_USER_SITE :
702
704
logger .debug (
703
- "User site-packages are disabled "
704
- "for security reasons or by an administrator."
705
- )
706
- use_user_site = False
707
- elif ENABLE_USER_SITE is False :
708
- logger .debug (
709
- "User site-packages are disabled by user request "
710
- "(with 'python -s' or PYTHONNOUSERSITE)"
705
+ "User site-packages is disabled "
706
+ "because site.ENABLE_USER_SITE is %s" ,
707
+ ENABLE_USER_SITE ,
711
708
)
712
709
use_user_site = False
713
710
elif root_path is not None :
@@ -728,7 +725,7 @@ def decide_user_install(
728
725
if virtualenv_no_global ():
729
726
raise InstallationError (
730
727
"Can not perform a '--user' install. "
731
- "User site-packages are not visible in this virtualenv."
728
+ "User site-packages is not visible in this virtualenv."
732
729
)
733
730
if not site_packages_writable (
734
731
user = use_user_site , root = root_path , isolated = isolated_mode ,
0 commit comments