[PATCH 4/4] Don't call udevDeviceFormat if we're just going to clear the device (#497323).

[Chris Lumens <clumens redhat com>]

---
 storage/devicetree.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/storage/devicetree.py b/storage/devicetree.py
index c73a24d..41eb88a 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -27,6 +27,8 @@ import re
 from errors import *
 from devices import *
 from deviceaction import *
+from partitioning import shouldClear
+from pykickstart.constants import *
 import formats
 import devicelibs.mdraid
 from udev import *
@@ -1166,7 +1168,9 @@ class DeviceTree(object):
                 device = self.addUdevPartitionDevice(info)
 
         # now handle the device's formatting
-        self.handleUdevDeviceFormat(info, device)
+        if not shouldClear(device, self.clearPartType, self.clearPartDisks,
+                           self.protectedPartitions):
+            self.handleUdevDeviceFormat(info, device)
 
     def handleUdevLUKSFormat(self, info, device):
         log_method_call(self, name=device.name, type=device.format.type)
-- 
1.6.1.3