forked from juju/charm-helpers
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update copy_nrpe_checks() for optional c-h directory
The function assumed that the charmhelpers directory would always be in the hooks directory. However, with PY3 it can be very tricky to try to keep a symlink in the hooks directory. Therefore, for some PY3 non-reactive charms, charmhelpers was moved to the CHARMDIR. However, this caused this function to fail. The change here is to search for the charmhelpers directory in both CHARMDIR and CHARMDIR/hooks and then use that. Closes-Bug: juju#246 LP-Bug: #1796830
- Loading branch information
1 parent
70e136d
commit 9788e37
Showing
2 changed files
with
32 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters