fix the test for macports existing

also, don't run dpkg before steps on non debian systems

2 files changed, 2 insertions, 3 deletions

diff --git a/features/steps/packages.rb b/features/steps/packages.rb
index 8260ac819a..ad234b179c 100644
--- a/features/steps/packages.rb
+++ b/features/steps/packages.rb
@@ -32,7 +32,7 @@ After("@apt") do
 end
 
 Before('@dpkg') do
-  purge_chef_integration_debs
+  purge_chef_integration_debs if debian_compatible?
 end
 
 Before('@apt') do
diff --git a/features/support/packages.rb b/features/support/packages.rb
index 9b4892798f..fdbe931f6f 100644
--- a/features/support/packages.rb
+++ b/features/support/packages.rb
@@ -4,8 +4,7 @@ def package_system_available?(name)
   case name
   when 'MacPorts'
     uname = `uname`
-    port = `which port`
-    (uname =~ /Darwin/ && !port.match(/not found/) && File.exist?('/opt'))
+    (uname =~ /Darwin/ && File.exist?('/opt') && shell_out("which port").status.success?)
   else
     false
   end