Skip to content

Commit bd8b436

Browse files
committed
Support the future parser in Puppet v3
1 parent df57c6e commit bd8b436

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ env:
1919
- PUPPET_GEM_VERSION="~> 3.6.0"
2020
- PUPPET_GEM_VERSION="~> 3.7.0"
2121
- PUPPET_GEM_VERSION="~> 3.8.0"
22+
- PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
2223

2324
sudo: false
2425

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ Puppet module for installing and managing python, pip, virtualenvs and Gunicorn
66

77
# Compatibility #
88

9-
Puppet v3 with Ruby versions 1.8.7, 1.9.3, 2.0.0 and 2.1.0.
9+
* Puppet v3 (with and without the future parser)
10+
11+
## Ruby versions
12+
13+
* 1.8.7
14+
* 1.9.3
15+
* 2.0.0
16+
* 2.1.0
1017

1118
## OS Distributions ##
1219

manifests/init.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
$use_epel = $python::params::use_epel,
7272
) inherits python::params{
7373

74-
# validate inputs
75-
if $provider != undef {
76-
validate_re($provider, ['^(pip|scl|rhscl)$'], 'Only "pip", "rhscl", and "scl" are valid providers besides the system default.')
74+
if $provider != undef and $provider != '' {
75+
validate_re($provider, ['^(pip|scl|rhscl)$'],
76+
"Only 'pip', 'rhscl' and 'scl' are valid providers besides the system default. Detected provider is <${provider}>.")
7777
}
7878

7979
if $provider == 'pip' {

0 commit comments

Comments
 (0)