Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PDK-420) Ensure Puppet and Puppet::Util modules are defined #277

Merged
merged 1 commit into from
Sep 5, 2017

Conversation

rodjek
Copy link
Contributor

@rodjek rodjek commented Aug 31, 2017

Puppet 5 changed the format of the module definition in Puppet::Util::Windows
from the expanded to condensed format. The downside of this change is that it
means that the requires are now order dependent, as the condensed format does
not define the parent objects if not already defined.

This change abstracts our require of puppet/util/windows, allowing us to
define the Puppet and Puppet::Util modules before requiring
puppet/util/windows, fixing the exception caused when pdk and puppet
exist in the same gemfile.

@rodjek rodjek force-pushed the pdk-420 branch 3 times, most recently from a884de5 to 1b73787 Compare August 31, 2017 04:10
@puppetlabs puppetlabs deleted a comment from coveralls Sep 1, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 1, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 1, 2017
@rodjek rodjek force-pushed the pdk-420 branch 2 times, most recently from ee4feb9 to 6a3543d Compare September 1, 2017 01:34
@puppetlabs puppetlabs deleted a comment from coveralls Sep 1, 2017
@rodjek rodjek force-pushed the pdk-420 branch 8 times, most recently from 76f2b33 to a2b4e1a Compare September 5, 2017 05:39
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@rodjek rodjek force-pushed the pdk-420 branch 2 times, most recently from df48c82 to 7fe53f7 Compare September 5, 2017 06:10
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
@puppetlabs puppetlabs deleted a comment from coveralls Sep 5, 2017
Puppet 5 changed the format of the module definition in Puppet::Util::Windows
from the expanded to condensed format. The downside of this change is that it
means that the requires are now order dependent, as the condensed format does
not define the parent objects if not already defined.

This change abstracts our require of `puppet/util/windows`, allowing us to
define the `Puppet` and `Puppet::Util` modules before requiring
`puppet/util/windows`, fixing the exception caused when `pdk` and `puppet`
exist in the same gemfile.
@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 93.719% when pulling fa60333 on rodjek:pdk-420 into 1594f34 on puppetlabs:master.

@DavidS DavidS merged commit 27e55b2 into puppetlabs:master Sep 5, 2017
@DavidS DavidS added the bug label Sep 5, 2017
@rodjek rodjek deleted the pdk-420 branch September 7, 2017 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants