Skip to content

Commit dc7d10e

Browse files
committed
only install to --user if user site is enabled
1 parent da87661 commit dc7d10e

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

graalpython/lib-graalpython/modules/ginstall.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,10 @@ def install_from_url(url, patch=None, extra_opts=[], cflags=""):
416416
f.write(patch)
417417
system("patch -d %s/%s/ -p1 < %s/%s.patch" % ((tempdir, bare_name)*2))
418418

419-
user_arg = "--user" if "--prefix" not in extra_opts else ""
419+
if "--prefix" not in extra_opts and site.ENABLE_USER_SITE:
420+
user_arg = "--user"
421+
else:
422+
user_arg = ""
420423
system("cd %s/%s; %s %s setup.py install %s %s" % (tempdir, bare_name, "CFLAGS=%s" % cflags if cflags else "", sys.executable, user_arg, " ".join(extra_opts)))
421424

422425

@@ -455,7 +458,10 @@ def install_from_pypi(package, extra_opts=[]):
455458
else:
456459
xit("Unknown file type: %s" % filename)
457460

458-
user_arg = "--user" if "--prefix" not in extra_opts else ""
461+
if "--prefix" not in extra_opts and site.ENABLE_USER_SITE:
462+
user_arg = "--user"
463+
else:
464+
user_arg = ""
459465
status = os.system("cd %s/%s; %s setup.py install %s %s" % (tempdir, dirname, sys.executable, user_arg, " ".join(extra_opts)))
460466
if status != 0:
461467
xit("An error occurred trying to run `setup.py install %s %s'" % (user_arg, " ".join(extra_opts)))

0 commit comments

Comments
 (0)