Skip to content

Commit 8b9ebd8

Browse files
committed
Merge pull request puppetlabs#566 from mcanevet/fix/future_parser
Fix for future parser
2 parents 9c2399b + 9303828 commit 8b9ebd8

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

manifests/params.pp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,11 @@
126126
$client_package_name = pick($client_package_name, "postgresql-client-${version}")
127127
$server_package_name = pick($server_package_name, "postgresql-${version}")
128128
$contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
129-
$postgis_package_name = pick(
130-
$postgis_package_name,
131-
versioncmp($postgis_version, '2') ? {
132-
'-1' => "postgresql-${version}-postgis",
133-
default => "postgresql-${version}-postgis-${postgis_version}",
134-
}
135-
)
129+
if versioncmp($postgis_version, '2') < 0 {
130+
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis")
131+
} else {
132+
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis-${postgis_version}")
133+
}
136134
$devel_package_name = pick($devel_package_name, 'libpq-dev')
137135
$java_package_name = pick($java_package_name, 'libpostgresql-jdbc-java')
138136
$perl_package_name = pick($perl_package_name, 'libdbd-pg-perl')

0 commit comments

Comments
 (0)