From 967880fc4a96546cf5a766494a050b677ad5c0a4 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 22 Jun 2015 16:50:09 -0700
Subject: [PATCH] check for nil

---
 spec/acceptance/concat_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index ad959cb34..2f7d4e3b2 100644
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -6,7 +6,7 @@
     groupname = 'system'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
   when 'Darwin'
@@ -14,7 +14,7 @@
     groupname = 'wheel'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
   when 'windows'
@@ -28,7 +28,7 @@
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
   else
@@ -36,7 +36,7 @@
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
 end