From a7a8043fd3ac17c4e0fe0bdbedd22be2fd7a9ac1 Mon Sep 17 00:00:00 2001
From: ts <thomashaw@localhost.localdomain>
Date: Wed, 26 Sep 2018 09:32:48 +0100
Subject: [PATCH] revert: change from wns branch...

---
 lib/objects/system.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/objects/system.rb b/lib/objects/system.rb
index 212d300c9..30ddddeec 100644
--- a/lib/objects/system.rb
+++ b/lib/objects/system.rb
@@ -28,7 +28,6 @@ class System
   # @return [Object] the list of selected modules
   def resolve_module_selection(available_modules, options)
     retry_count = 0
-    begin
     # Replace $IP_addresses with options ip_ranges if required
     begin
       if options[:ip_ranges] and $datastore['IP_addresses'] and !$datastore['replaced_ranges']
@@ -80,6 +79,7 @@ class System
       exit
     end
 
+    begin
       selected_modules = []
       self.num_actioned_module_conflicts = 0