(MODULES-3677) Ensure Chocolatey Config #37
Merged
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
When Chocolatey has been installed and not yet run, the config file doesn't exist. So chocolateyconfig, chocolateyfeature, and chocolateysource will all fail until the config file exists. Trigger a version check before returning the config file in `PuppetX::Chocolatey::ChocolateyCommon.choco_config_file`. This will ensure that an installed Chocolatey will have had the chance to run at least one time if it is installed, thus ensuring the config file's existence, allowing the providers to work without erroring on a missing config file.
| @@ -62,6 +62,10 @@ def choco_config_file | |||
| chocoInstallPath = PuppetX::Chocolatey::ChocolateyInstall.install_path | |||
| choco_config = "#{chocoInstallPath}\\config\\chocolatey.config" | |||
|
|
|||
| # choco may be installed, but a config file doesn't exist until the | |||
| # first run of choco - trigger that by checking the version | |||
| choco_run_ensure_config = choco_version | |||
There was a problem hiding this comment.
Would it be better to add an additional file existance check above as well? That way we don't run a choco.exe IF the config file exists
There was a problem hiding this comment.
We typically call choco -v during the run and then store the results for the remainder of the run, this just moves that call up earlier.
|
Created MODULES-3691 to create acceptance test for this change. |
ThoughtCrhyme
pushed a commit
to ThoughtCrhyme/puppetlabs-chocolatey
that referenced
this pull request
Mar 20, 2017
Updated vmfloaty module to allow different home dirs
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.
When Chocolatey has been installed and not yet run, the config file
doesn't exist. So chocolateyconfig, chocolateyfeature, and
chocolateysource will all fail until the config file exists.
Trigger a version check before returning the config file in
PuppetX::Chocolatey::ChocolateyCommon.choco_config_file. Thiswill ensure that an installed Chocolatey will have had the chance
to run at least one time if it is installed, thus ensuring the
config file's existence, allowing the providers to work without
erroring on a missing config file.