From 19af1ed26e13a9eebe998a112041e46bd2928268 Mon Sep 17 00:00:00 2001
From: David Lehman <dlehman@redhat.com>
Date: Fri, 6 Mar 2015 13:12:16 -0600
Subject: [PATCH 19/19] Port of b3f28a2d1f from master.

---
 blivet/discoverer.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/blivet/discoverer.py b/blivet/discoverer.py
index 5df7fb4..ce06fa6 100644
--- a/blivet/discoverer.py
+++ b/blivet/discoverer.py
@@ -723,9 +723,10 @@ class DeviceDiscoverer(object):
         #
         # The first step is to either look up or create the device
         #
+        device_added = True
         if device:
             # we successfully looked up the device. skip to format handling.
-            pass
+            device_added = False
         elif udev.device_is_loop(info):
             log.info("%s is a loop device", name)
             device = self.addUdevLoopDevice(info)
@@ -790,7 +791,8 @@ class DeviceDiscoverer(object):
 
         # now handle the device's formatting
         self.handleUdevDeviceFormat(info, device)
-        device.originalFormat = copy.copy(device.format)
+        if device_added:
+            device.originalFormat = copy.copy(device.format)
         device.deviceLinks = udev.device_get_symlinks(info)
 
     def handleUdevDiskLabelFormat(self, info, device):
-- 
1.9.3