diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/llnl/util/filesystem.py | 7 | ||||
| -rw-r--r-- | lib/spack/spack/test/installer.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/util/file_permissions.py | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index 753129b78e..286273fc83 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -302,13 +302,16 @@ def group_ids(uid=None): return [g.gr_gid for g in grp.getgrall() if user in g.gr_mem] -def chgrp(path, group): +def chgrp(path, group, follow_symlinks=True): """Implement the bash chgrp function on a single path""" if isinstance(group, six.string_types): gid = grp.getgrnam(group).gr_gid else: gid = group - os.chown(path, -1, gid) + if follow_symlinks: + os.chown(path, -1, gid) + else: + os.lchown(path, -1, gid) def chmod_x(entry, perms): diff --git a/lib/spack/spack/test/installer.py b/lib/spack/spack/test/installer.py index 4f7f24dc24..47174ad73f 100644 --- a/lib/spack/spack/test/installer.py +++ b/lib/spack/spack/test/installer.py @@ -834,7 +834,7 @@ def test_setup_install_dir_grp(install_mockery, monkeypatch, capfd): def _get_group(spec): return mock_group - def _chgrp(path, group): + def _chgrp(path, group, follow_symlinks=True): tty.msg(mock_chgrp_msg.format(path, group)) monkeypatch.setattr(prefs, 'get_package_group', _get_group) diff --git a/lib/spack/spack/util/file_permissions.py b/lib/spack/spack/util/file_permissions.py index 9a510ef6c8..b2de56eda9 100644 --- a/lib/spack/spack/util/file_permissions.py +++ b/lib/spack/spack/util/file_permissions.py @@ -44,7 +44,7 @@ def set_permissions(path, perms, group=None): fs.chmod_x(path, perms) if group: - fs.chgrp(path, group) + fs.chgrp(path, group, follow_symlinks=False) class InvalidPermissionsError(SpackError): |