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

make sure that directories are actually a Hash #536

Merged
merged 1 commit into from
Jan 24, 2014
Merged

make sure that directories are actually a Hash #536

merged 1 commit into from
Jan 24, 2014

Conversation

igalic
Copy link
Contributor

@igalic igalic commented Dec 15, 2013

this should fix #535

@@ -393,6 +393,9 @@

## Create a default directory list if none defined
if $directories {
unless (is_hash($directories) or (is_array($directories) and is_hash($directories[0]))) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this line should be:

unless is_hash($directories) or (is_array($directories) and is_hash($directories[0])) {

to make the tests happy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ACK.

@igalic
Copy link
Contributor Author

igalic commented Jan 13, 2014

updated

@blkperl
Copy link
Contributor

blkperl commented Jan 24, 2014

@igalic

Travis tests are still broken.

@igalic
Copy link
Contributor Author

igalic commented Jan 24, 2014

weird, it's only failing on 1.8.7.. on some versions thereof.

this should fix #535

n.b.: older versions of puppet do not support unless
btw: When you switch from unless to if, you must also switch from
'foo or bar' to '!foo and !bar', because, logic.
blkperl added a commit that referenced this pull request Jan 24, 2014
make sure that directories are actually a Hash
@blkperl blkperl merged commit 15fc739 into puppetlabs:master Jan 24, 2014
@hunner
Copy link
Contributor

hunner commented Jan 24, 2014

This actually isn't related to #535

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

5 participants