unset sticky bit when clearing working directory (#483)

MarkUsProject · Feb 7, 2024 · bbc999d · bbc999d
1 parent 044f2dd
commit bbc999d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,9 @@
 # CHANGELOG
 All notable changes to this project will be documented here.
 
+## [unreleased]
+- Fix bug that prevented copies of instructor directories from being deleted (#483)
+
 ## [v2.4.0]
 - Fix bug that prevented test results from being returned when a feedback file could not be found (#458)
 - Add support for Python 3.11 and 3.12 (#467)

diff --git a/server/autotest_server/__init__.py b/server/autotest_server/__init__.py
@@ -254,9 +254,9 @@ def _clear_working_directory(tests_path: str, test_username: str) -> None:
     Run commands that clear the tests_path working directory
     """
     if test_username != getpass.getuser():
-        chmod_cmd = f"sudo -u {test_username} -- bash -c 'chmod -Rf ugo+rwX {tests_path}'"
+        chmod_cmd = f"sudo -u {test_username} -- bash -c 'chmod -Rf -t ugo+rwX {tests_path}'"
     else:
-        chmod_cmd = f"chmod -Rf ugo+rwX {tests_path}"
+        chmod_cmd = f"chmod -Rf -t ugo+rwX {tests_path}"
 
     subprocess.run(chmod_cmd, shell=True)