Skip to content

Commit

Permalink
cleanup wrappers too
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <[email protected]>
  • Loading branch information
vsoch committed Aug 28, 2023
1 parent c9ec208 commit b7ff0e4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
8 changes: 8 additions & 0 deletions shpc/main/modules/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ def uninstall(self, name, force=False):
"$module_base/%s" % module.name,
)

# If we have a wrapper
if module.wrapper_dir != module.module_dir:
self._uninstall(
module.wrapper_dir,
self.settings.wrapper_base,
"$wrapper_base/%s" % module.name,
)

# If uninstalling the entire module, clean up symbolic links in all views
for view_name in views_with_module:
self.views[view_name].uninstall(module.module_dir)
Expand Down
2 changes: 2 additions & 0 deletions shpc/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ container_base: $root_dir/containers
# When parsing labels, replace newlines with this string
label_separator: ', '

wrapper_base: /tmp/wrappers

# Default root directory to create views
views_base: $root_dir/views

Expand Down

0 comments on commit b7ff0e4

Please sign in to comment.