From a8448286f78165b24f0502bda42d28966b9e7723 Mon Sep 17 00:00:00 2001 From: Wilson McCoubrey Date: Wed, 29 Mar 2017 15:49:27 +0100 Subject: [PATCH] [maint] Fix puppet-lint warnings introduced with 2.2.0 puppet-lint release --- manifests/init.pp | 6 ++---- manifests/oracle.pp | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 461a9de..2a8efd6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -118,14 +118,12 @@ class java( } anchor { 'java::begin:': } - -> - package { 'java': + -> package { 'java': ensure => $version, install_options => $package_options, name => $use_java_package_name, } - -> - class { 'java::config': } + -> class { 'java::config': } -> anchor { 'java::end': } } diff --git a/manifests/oracle.pp b/manifests/oracle.pp index c97ebb0..7b8ca5d 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -226,13 +226,14 @@ define java::oracle ( creates => $creates_path, proxy_server => $proxy_server, proxy_type => $proxy_type, - }-> + } case $::kernel { 'Linux' : { exec { "Install Oracle java_se ${java_se} ${version}" : path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', command => $install_command, creates => $creates_path, + before => Archive[$destination] } } default : {