Merge pull request puppetlabs#387 from hunner/change_error_detection

Change error detection for version to after other parameters

Author: hunner

manifests/globals.pp

@@ -83,9 +83,6 @@
     default => undef,
   }
   $globals_version = pick($version, $default_version, 'unknown')
-  if($globals_version == 'unknown') {
-    fail('No preferred version defined or automatically detected.')
-  }
 
   # Setup of the repo only makes sense globally, so we are doing this here.
   if($manage_package_repo) {

manifests/params.pp

@@ -168,4 +168,8 @@
   $pg_hba_conf_defaults = pick($pg_hba_conf_defaults, true)
   $postgresql_conf_path = pick($postgresql_conf_path, "${confdir}/postgresql.conf")
   $default_database     = pick($default_database, 'postgres')
+
+  if($version == 'unknown') {
+    fail('No preferred version defined or automatically detected.')
+  }
 }

spec/acceptance/unsupported_spec.rb

@@ -5,12 +5,12 @@
     pp = <<-EOS
     class { 'postgresql::client': }
     EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/No preferred version defined or automatically detected/i)
+    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not provide defaults for osfamily/i)
   end
   it 'should fail for server' do
     pp = <<-EOS
     class { 'postgresql::server': }
     EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/No preferred version defined or automatically detected/i)
+    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not provide defaults for osfamily/i)
   end
 end