Add StorageDevice.serial_for_display

Sometimes we need to compare serials, and sometimes we need to display
them.  The two aren't necessarily the same thing, so add a function to
differentiate them.

2 files changed, 7 insertions, 0 deletions

diff --git a/iw/cleardisks_gui.py b/iw/cleardisks_gui.py
index 6b1c2e258..f97acf143 100644
--- a/iw/cleardisks_gui.py
+++ b/iw/cleardisks_gui.py
@@ -160,6 +160,7 @@ class ClearDisksWindow (InstallWindow):
                                      d.model,
                                      str(int(d.size)) + " MB",
                                      d.vendor, "", d.serial))
+                                     d.vendor, "", d.serial_for_display))
 
         self.addButton.connect("clicked", self._add_clicked)
         self.removeButton.connect("clicked", self._remove_clicked)
diff --git a/storage/devices.py b/storage/devices.py
index 604eec469..898273040 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -754,6 +754,10 @@ class StorageDevice(Device):
         return self._serial
 
     @property
+    def serial_for_display(self):
+        return self.serial
+
+    @property
     def model(self):
         if not self._model:
             self._model = getattr(self.partedDevice, "model", "")
@@ -3055,6 +3059,8 @@ class MultipathDevice(DMDevice):
         return self._getWwidFromSerial(self._serial)
 
     @property
+    def serial_for_display(self):
+        return self.wwid
 
     @property
     def model(self):