From: Jonathan Boyett <jonathan@failingservers.com>
Date: Tue, 10 May 2011 22:30:46 +0000 (-0700)
Subject: cleanup flush and insert_order methods
X-Git-Tag: v0.0.1~68
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=345d511cd423e0dbcc108289df21c818b1fa1ab9;p=puppet-modules%2Fpuppetlabs-firewall.git

cleanup flush and insert_order methods
---

diff --git a/lib/puppet/provider/firewall/iptables.rb b/lib/puppet/provider/firewall/iptables.rb
index 75d24da..427eb0f 100644
--- a/lib/puppet/provider/firewall/iptables.rb
+++ b/lib/puppet/provider/firewall/iptables.rb
@@ -60,8 +60,7 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
   # Flush the property hash once done.
   def flush
     debug("[flush]")
-    needs_change = @property_hash.delete(:needs_change)
-    if needs_change
+    if @property_hash.delete(:needs_change)
       notice("Properties changed - updating rule")
       update
     end
@@ -143,8 +142,7 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
     
     # Find list of current rules based on chain
     self.class.instances.each do |rule|
-      next unless rule.chain == resource[:chain].to_s
-      rules << rule.name
+      rules << rule.name if rule.chain == resource[:chain].to_s
     end
 
     # No rules at all? Just bail now.