Update copy_nrpe_checks() for optional c-h directory #247
Conversation
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
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
ajkavanagh
added a commit
to ajkavanagh/charm-helpers
that referenced
this pull request
Nov 27, 2018
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
ryan-beisner
pushed a commit
that referenced
this pull request
Nov 27, 2018
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: #246 LP-Bug: #1796830
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: #246
LP-Bug: #1796830