zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use pwd for usernames on unix (#19980)

Browse Source
This commit is contained in:
Greg Becker 2022-11-08 10:36:10 -08:00 committed by GitHub
parent 052bf6b9df
commit 97fe7ad32b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/spack/spack/util/path.py
View File

@ -39,6 +39,18 @@ def architecture():
return spack.spec.ArchSpec((str(host_platform), str(host_os), str(host_target))) return spack.spec.ArchSpec((str(host_platform), str(host_os), str(host_target)))
def get_user():
# User pwd where available because it accounts for effective uids when using ksu and similar
try:
# user pwd for unix systems
import pwd
return pwd.getpwuid(os.geteuid()).pw_name
except ImportError:
# fallback on getpass
return getpass.getuser()
# Substitutions to perform # Substitutions to perform
def replacements(): def replacements():
# break circular import from spack.util.executable # break circular import from spack.util.executable
@ -48,7 +60,7 @@ def replacements():
return { return {
"spack": spack.paths.prefix, "spack": spack.paths.prefix,
"user": getpass.getuser(), "user": get_user(),
"tempdir": tempfile.gettempdir(), "tempdir": tempfile.gettempdir(),
"user_cache_path": spack.paths.user_cache_path, "user_cache_path": spack.paths.user_cache_path,
"architecture": str(arch), "architecture": str(arch),