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

MODULES-1696: ensure mod::setenvif is included if needed #995

Merged
merged 1 commit into from
Feb 6, 2015

Conversation

jlambert121
Copy link
Contributor

No description provided.

@@ -390,6 +390,12 @@
}
}

if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems redundant:

empty(undef) ==> true
empty([]) ==> true
empty('') ==> true

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just copying https://github.com/jlambert121/puppetlabs-apache/blob/modules_1696/manifests/vhost.pp#L393 - I think those two should match. The default for these is [], should it instead be undef? Otherwise this would by default always be true.

igalic added a commit that referenced this pull request Feb 6, 2015
MODULES-1696: ensure mod::setenvif is included if needed
@igalic igalic merged commit b8b15f7 into puppetlabs:master Feb 6, 2015
@igalic
Copy link
Contributor

igalic commented Feb 6, 2015

thanks @jlambert121!

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.

None yet

3 participants